From cf7169a2ede9bb08b71de68fe0c8bbecf827abe6 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 24 Feb 2009 23:05:42 -0700 Subject: [PATCH] Imported Upstream version 1.21 --- ChangeLog | 196 +- INSTALL | 94 +- Makefile.in | 164 +- NEWS | 68 +- THANKS | 4 + aclocal.m4 | 9 +- build-aux/config.guess | 10 +- build-aux/config.rpath | 24 +- build-aux/config.sub | 23 +- build-aux/texinfo.tex | 102 +- config.hin | 79 +- configure | 4865 ++++++++++++++++++++++++++++--------- configure.ac | 4 +- doc/Makefile.in | 164 +- doc/getdate.texi | 13 +- doc/stamp-vti | 8 +- doc/tar.info | 737 +++--- doc/tar.info-1 | 404 ++- doc/tar.info-2 | 546 +++-- doc/tar.texi | 233 +- doc/version.texi | 8 +- lib/Makefile.in | 607 +++-- lib/argp-fmtstream.h | 34 +- lib/argp-help.c | 22 +- lib/argp-parse.c | 2 +- lib/c-ctype.c | 398 +++ lib/c-ctype.h | 297 +++ lib/canonicalize-lgpl.c | 2 +- lib/chdir-long.c | 3 +- lib/close-stream.c | 6 +- lib/close.c | 82 + lib/closeout.c | 43 +- lib/closeout.h | 6 +- lib/dirent.in.h | 28 +- lib/dirfd.c | 4 +- lib/dirfd.h | 28 - lib/errno.in.h | 157 ++ lib/fchdir.c | 80 +- lib/{lstat.h => fclose.c} | 40 +- lib/fcntl.in.h | 30 +- lib/float.in.h | 6 +- lib/fseeko.c | 62 +- lib/getcwd.c | 4 +- lib/getdate.c | 703 +++--- lib/getdate.y | 198 +- lib/getdelim.c | 15 +- lib/gnulib.mk | 250 +- lib/inttostr.h | 25 +- lib/inttypes.in.h | 5 +- lib/localcharset.c | 6 +- lib/lstat.c | 23 +- lib/memchr.c | 208 +- lib/memrchr.c | 200 +- lib/mktime.c | 4 +- lib/open-safer.c | 9 +- lib/open.c | 140 ++ lib/openat-die.c | 12 +- lib/openat.c | 4 +- lib/rawmemchr.c | 136 ++ lib/rawmemchr.valgrind | 12 + lib/regcomp.c | 52 +- lib/regex_internal.c | 6 +- lib/regex_internal.h | 8 +- lib/regexec.c | 7 +- lib/rpmatch.c | 125 +- lib/stdarg.in.h | 4 + lib/stdbool.in.h | 6 +- lib/stdint.in.h | 5 +- lib/stdio-impl.h | 94 + lib/stdio-write.c | 148 ++ lib/stdio.in.h | 110 + lib/stdlib.in.h | 152 ++ lib/strchrnul.c | 121 +- lib/strchrnul.valgrind | 12 + lib/strerror.c | 242 +- lib/string.in.h | 38 +- lib/strings.in.h | 6 +- lib/sys_stat.in.h | 80 +- lib/sys_time.in.h | 6 +- lib/sysexits.in.h | 6 +- lib/time.in.h | 6 +- lib/unistd.in.h | 219 +- lib/uniwidth/width.c | 4 +- lib/utimens.c | 169 +- lib/vasnprintf.c | 235 +- lib/wchar.in.h | 14 +- lib/wctype.in.h | 56 +- lib/write.c | 62 + lib/xalloc.h | 24 +- lib/xmalloc.c | 2 +- m4/close.m4 | 25 + m4/dirent_h.m4 | 39 + m4/dirfd.m4 | 14 +- m4/eoverflow.m4 | 70 - m4/errno_h.m4 | 113 + m4/extensions.m4 | 6 +- m4/fchdir.m4 | 13 +- m4/fclose.m4 | 18 + m4/fpending.m4 | 7 +- m4/getdate.m4 | 12 +- m4/getdelim.m4 | 1 + m4/getopt.m4 | 6 +- m4/gnulib-common.m4 | 40 +- m4/gnulib-comp.m4 | 104 +- m4/include_next.m4 | 34 +- m4/inttypes.m4 | 12 +- m4/lib-link.m4 | 27 +- m4/lib-prefix.m4 | 88 +- m4/lstat.m4 | 10 +- m4/mbstate_t.m4 | 10 +- m4/open.m4 | 66 + m4/openat.m4 | 7 +- m4/printf.m4 | 1309 ++++++++++ m4/rawmemchr.m4 | 21 + m4/regex.m4 | 9 +- m4/rpmatch.m4 | 22 +- m4/sleep.m4 | 13 +- m4/snprintf.m4 | 15 +- m4/stdint.m4 | 20 +- m4/stdio_h.m4 | 136 +- m4/stdlib_h.m4 | 43 +- m4/strdup.m4 | 22 +- m4/strerror.m4 | 63 +- m4/string_h.m4 | 13 +- m4/strndup.m4 | 8 +- m4/strtoll.m4 | 6 +- m4/strtoull.m4 | 6 +- m4/sys_stat_h.m4 | 51 +- m4/unistd_h.m4 | 44 +- m4/utimens.m4 | 7 +- m4/vsnprintf.m4 | 15 +- m4/wchar.m4 | 25 +- m4/wctype.m4 | 34 +- m4/wcwidth.m4 | 6 +- m4/write.m4 | 20 + po/bg.gmo | Bin 67398 -> 67136 bytes po/bg.po | 807 +++--- po/cs.gmo | Bin 12757 -> 12565 bytes po/cs.po | 799 +++--- po/da.gmo | Bin 13053 -> 12809 bytes po/da.po | 799 +++--- po/de.gmo | Bin 56715 -> 56817 bytes po/de.po | 815 ++++--- po/el.gmo | Bin 18211 -> 17925 bytes po/el.po | 799 +++--- po/es.gmo | Bin 28308 -> 28085 bytes po/es.po | 824 ++++--- po/et.gmo | Bin 47907 -> 47705 bytes po/et.po | 804 +++--- po/eu.gmo | Bin 38929 -> 38722 bytes po/eu.po | 803 +++--- po/fi.gmo | Bin 38670 -> 38461 bytes po/fi.po | 800 +++--- po/fr.gmo | Bin 59166 -> 59342 bytes po/fr.po | 815 ++++--- po/ga.gmo | Bin 55587 -> 58338 bytes po/ga.po | 918 +++---- po/gl.gmo | Bin 13446 -> 13262 bytes po/gl.po | 804 +++--- po/hr.gmo | Bin 13318 -> 13130 bytes po/hr.po | 799 +++--- po/hu.gmo | Bin 59127 -> 59504 bytes po/hu.po | 922 +++---- po/id.gmo | Bin 13049 -> 54614 bytes po/id.po | 1814 +++++++------- po/it.gmo | Bin 27656 -> 55988 bytes po/it.po | 2470 ++++++++----------- po/ja.gmo | Bin 52267 -> 52020 bytes po/ja.po | 806 +++--- po/ko.gmo | Bin 4874 -> 4797 bytes po/ko.po | 801 +++--- po/ky.gmo | Bin 68210 -> 67957 bytes po/ky.po | 802 +++--- po/ms.gmo | Bin 12358 -> 12180 bytes po/ms.po | 799 +++--- po/nb.gmo | Bin 5418 -> 5234 bytes po/nb.po | 803 +++--- po/nl.gmo | Bin 55889 -> 56027 bytes po/nl.po | 828 ++++--- po/pl.gmo | Bin 55277 -> 55400 bytes po/pl.po | 816 ++++--- po/pt.gmo | Bin 4574 -> 4484 bytes po/pt.po | 808 +++--- po/pt_BR.gmo | Bin 13444 -> 13259 bytes po/pt_BR.po | 799 +++--- po/ro.gmo | Bin 27253 -> 27031 bytes po/ro.po | 800 +++--- po/ru.gmo | Bin 68892 -> 68616 bytes po/ru.po | 804 +++--- po/sk.gmo | Bin 13105 -> 12922 bytes po/sk.po | 799 +++--- po/sl.gmo | Bin 38968 -> 38764 bytes po/sl.po | 811 ++++--- po/sv.gmo | Bin 53874 -> 53966 bytes po/sv.po | 819 ++++--- po/tar.pot | 789 +++--- po/tr.gmo | Bin 52779 -> 52595 bytes po/tr.po | 804 +++--- po/uk.gmo | Bin 72526 -> 72224 bytes po/uk.po | 807 +++--- po/vi.gmo | Bin 60084 -> 60193 bytes po/vi.po | 813 ++++--- po/zh_CN.gmo | Bin 15313 -> 50429 bytes po/zh_CN.po | 1656 +++++++------ po/zh_TW.gmo | Bin 25801 -> 25592 bytes po/zh_TW.po | 798 +++--- rmt/Makefile.in | 164 +- scripts/Makefile.in | 164 +- src/Makefile.in | 164 +- src/buffer.c | 824 ++++--- src/checkpoint.c | 2 +- src/common.h | 23 +- src/create.c | 6 +- src/extract.c | 3 - src/incremen.c | 128 +- src/list.c | 23 +- src/names.c | 12 +- src/suffix.c | 1 + src/system.c | 37 +- src/tar.c | 74 +- src/transform.c | 92 +- src/xheader.c | 2 - tests/Makefile.am | 3 + tests/Makefile.in | 167 +- tests/atlocal.in | 4 + tests/delete05.at | 2 +- tests/genfile.c | 8 +- tests/gzip.at | 2 +- tests/ignfail.at | 4 +- tests/incremental.at | 5 +- tests/listed01.at | 2 +- tests/longv7.at | 2 +- tests/lustar01.at | 2 +- tests/lustar02.at | 2 +- tests/multiv05.at | 6 +- tests/multiv06.at | 52 + tests/package.m4 | 4 +- tests/rename04.at | 83 + tests/rename05.at | 81 + tests/shortfile.at | 2 +- tests/sparsemv.at | 10 +- tests/sparsemvp.at | 6 +- tests/testsuite | 1979 ++++++++++++--- tests/testsuite.at | 3 + tests/volsize.at | 11 +- 245 files changed, 32858 insertions(+), 20350 deletions(-) create mode 100644 lib/c-ctype.c create mode 100644 lib/c-ctype.h create mode 100644 lib/close.c delete mode 100644 lib/dirfd.h create mode 100644 lib/errno.in.h rename lib/{lstat.h => fclose.c} (53%) create mode 100644 lib/open.c create mode 100644 lib/rawmemchr.c create mode 100644 lib/rawmemchr.valgrind create mode 100644 lib/stdio-impl.h create mode 100644 lib/stdio-write.c create mode 100644 lib/strchrnul.valgrind create mode 100644 lib/write.c create mode 100644 m4/close.m4 create mode 100644 m4/dirent_h.m4 delete mode 100644 m4/eoverflow.m4 create mode 100644 m4/errno_h.m4 create mode 100644 m4/fclose.m4 create mode 100644 m4/open.m4 create mode 100644 m4/printf.m4 create mode 100644 m4/rawmemchr.m4 create mode 100644 m4/write.m4 create mode 100644 tests/multiv06.at create mode 100644 tests/rename04.at create mode 100644 tests/rename05.at diff --git a/ChangeLog b/ChangeLog index f2723fb..7dd05f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,195 @@ +2008-11-30 Sergey Poznyakoff + + * src/xheader.c: Remove duplicate inclusion of fnmatch.h. Reported + by Jim Meyering. + +2008-11-25 Sergey Poznyakoff + + Do not try to drain the input pipe before closing the + archive. + + * src/buffer.c (close_archive): Remove call to + sys_drain_input_pipe. Pass hit_eof as the second + argument to sys_wait_for_child. + * src/common.h (sys_drain_input_pipe): Remove + (sys_wait_for_child): Declare second argument. + * src/system.c (sys_drain_input_pipe): Remove. + (sys_wait_for_child): Take two arguments. The second one helps to + decide whether to tolerate child termination on SIGPIPE. + +2008-11-03 Sergey Poznyakoff + + * src/buffer.c (_write_volume_label): Fix typo, which prevented + `-V label -M' from working. + +2008-10-30 Sergey Poznyakoff + + * NEWS, configure.ac: Version 1.20.91 + * doc/tar.texi: Document transformation scope flags. + * src/common.h (transform_symlinks_option): Remove in favor of + transformation scope flags. + (XFORM_REGFILE, XFORM_LINK, XFORM_SYMLINK, XFORM_ALL): New macros. + (transform_name, transform_member_name, transform_name_fp): Take + an additional argument, specifying scope flags. + * src/create.c: Reflect changes to transform_name. + * src/extract.c (extract_link, extract_symlink): Remove calls to + transform_member_name. It is done in read_header. + * src/list.c (decode_xform): Reflect change in data type of 2nd + argument. + (transform_member_name): 2nd arg is int. + (decode_header): Transform file name and link target names. + * src/tar.c: Remove --transform-symlinks. + * src/transform.c (struct transform): New member `flags'. + (transform_flags): New variable. + (parse_transform_expr): Parse transformation scope flags. Allow to + set global flags using `flags=' syntax. + (_transform_name_to_obstack, transform_name_fp) + (transform_name): Take an additional argument, specifying scope + flags. + +2008-10-19 Sergey Poznyakoff + + * THANKS: Add Ed Leaver. + * src/buffer.c (short_read): Remove !read_full_records condition, + which was always false on a first record and thus disabled record + size autodetection. Thanks Ed Leaver for the patch. + (_gnu_flush_read): Handle blocking_factor == 1. + * tests/sparsemv.at: Reflect changes to buffer.c. + * tests/sparsemvp.at: Likewise. + * tests/volsize.at: Likewise. + * NEWS: Update. + +2008-10-16 Sergey Poznyakoff + + * src/common.h (transform_symlinks_option): New global. + * src/create.c (dump_file0): Transform symlink targets only if + explicitly required. Thanks Cyril Strejc for reporting the + problem. + * src/tar.c (parse_opt): New options --transform-symlinks and + --no-transform-symlinks. New alias --xform to the --transform + option. + * doc/tar.texi: Document --transform-symlinks + * NEWS: Update. + * THANKS: Update. + + * src/names.c (name_gather): Use xzalloc. + * src/buffer.c (short_read): Move record size detection before + the loop. + +2008-10-07 Sergey Poznyakoff + + * src/tar.c (options): Add --lzop option. + +2008-10-05 Xavier Hienne (tiny change) + + * src/checkpoint.c (checkpoint_compile_action): Add missing + `else'. + +2008-09-24 Sergey Poznyakoff + + * NEWS: Update. + * doc/tar.texi: Update. + * src/tar.c: New option --no-null. + +2008-09-23 Sergey Poznyakoff + + * src/common.h (filename_terminator): Remove global. + * src/tar.c (filename_terminator): New static. + * src/names.c (name_next_elt): Do not depend on + filename_terminator, this was a leftover from 1.13. + +2008-09-18 Sergey Poznyakoff + + * doc/tar.texi: Remove incorrect example. + +2008-09-07 Sergey Poznyakoff + + * src/incremen.c (dumpdir_create0): Eliminate gcc warning. + (attach_directory): Bugfix - add missing return statement. + * THANKS: Add Enric Hernandez + +2008-07-31 Sergey Poznyakoff + + * src/incremen.c (struct directory): New member `next'. Change + type of `name'. + (dirhead, dirtail): New statics. + (make_directory): Reflect changes to struct directory. + (free_directory, attach_directory): New functions. + (dirlist_replace_prefix): New function. + (note_directory): Use attach_directory, instead of make_directory, + (find_directory, find_directory_meta): Use free_directory. + (procdir): Replace directory prefixes in directory list to avoid + marking subdirectories as renamed after renaming their parent + directory. + (append_incremental_renames): Iterate over directory list, not + hash table, to preserve logical ordering of renames. + * tests/rename04.at, tests/rename05.at: New test cases. + * tests/Makefile.am, tests/testsuite.at: Add rename04.at and + rename05.at. + * tests/atlocal.in (decho): New function. + * tests/multiv06.at: Use decho instead of echo2. + * tests/incremental.at: Raise wait interval to 2 seconds. + +2008-07-24 Sergey Poznyakoff + + * src/tar.c (decode_options): Do not allow volume length less + than record size. + * src/buffer.c (_gnu_flush_write): Compensate for the effect + of eventual flush_archive occurring in the middle of buffer + move. + Increment records_written only if _flush_write was able to write + something. + * tests/multiv06.at: New testcase. + * tests/Makefile.am, test/testsuite.at: Add tests/multiv06.at + +2008-06-26 Sergey Poznyakoff + + * configure.ac, NEWS: Version 1.20.90 + * doc/tar.texi: Document -J, --no-auto-compress, etc. + * src/buffer.c (ct_tar): New constant. + (magic): Add lzop support. Proposed by Kevin Day + . + (check_compressed_archive): Do not use autodetect if the + compression program was specified explicitly. + Fall back to analyzing archive name, if the autodetection fails. + * src/suffix.c: Add .lzo + * src/tar.c: New options --lzop and --no-auto-compress. + New short option -J (alias for --lzma). + + * src/buffer.c (try_new_volume): Print more information with error + diagnostics. + (_gnu_flush_write): Improve error checking. Adjust + real_s_sizeleft before calling new_volume to avoid creating + malformed multivolume headers. + * tests/delete05.at, tests/gzip.at, tests/ignfail.at, + tests/longv7.at, tests/lustar01.at, tests/lustar02.at, + tests/shortfile.at: Update to match new diagnostic wording + (see 2008-05-06). + + * NEWS: Update. + +2008-06-14 Sergey Poznyakoff + + * doc/tar.texi (exclude): Document support for new VCS. + * THANKS: Update. + * NEWS: Update. + * tests/multiv05.at: Fix typos. + * tests/volsize.at: Remove a TZ dependency. + +2008-06-14 Dan Drake (tiny change) + + * src/tar.c (exclude_vcs_files): Support for Bazaar, Mercurial and + Darcs. + +2008-05-06 Sergey Poznyakoff + + * src/tar.c (main): Reword the "delayed error" message. New + wording proposed by Karl Berry. + 2008-02-20 Sergey Poznyakoff + * configure.ac: Raise version number to 1.20 + * src/compare.c (diff_dumpdir): const. * src/common.h (dumpdir_t,dumpdir_iter_t): New data types. (dumpdir_create0,dumpdir_create,dumpdir_free,dumpdir_locate) (dumpdir_first,dumpdir_next): New functions. @@ -9,9 +199,11 @@ (struct directory): Change members char *contents, *icontents to struct dumpdir *dump, *idump. All references updated. (note_directory): Last arg is const. + * src/names.c (add_hierarchy_to_namelist): buffer is const. + * tests/incr03.at, tests/incr04.at, tests/rename02.at, + tests/rename03.at: Insert calls to sleep between creation of files + and adding them to the archive. - * src/system.c: Remove setenv.h - 2008-03-31 Sergey Poznyakoff * src/create.c (dump_file0): Count links only for actually dumped diff --git a/INSTALL b/INSTALL index e8edf5c..8b82ade 100644 --- a/INSTALL +++ b/INSTALL @@ -2,15 +2,15 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. +2006, 2007, 2008 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./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. @@ -73,9 +73,9 @@ The simplest way to compile this package is: Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,7 +88,7 @@ is an example: Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -100,10 +100,24 @@ architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -138,14 +152,36 @@ find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -171,9 +207,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -182,7 +218,7 @@ A warning: not all `configure' scripts look for a site script. Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -201,11 +237,19 @@ an Autoconf bug. Until the bug is fixed you can use this workaround: `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -232,6 +276,16 @@ an Autoconf bug. Until the bug is fixed you can use this workaround: Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff --git a/Makefile.in b/Makefile.in index 20fb134..08ae832 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,19 +52,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.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/closeout.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/eoverflow.m4 \ + $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fcntl-safer.m4 \ - $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fileblocks.m4 \ - $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ - $(top_srcdir)/m4/ftruncate.m4 \ + $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ + $(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl_h.m4 \ + $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/float_h.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ + $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getdelim.m4 \ @@ -89,41 +90,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.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/setenv.m4 \ - $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/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/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/sys_stat_h.m4 \ - $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ - $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/sleep.m4 \ + $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ + $(top_srcdir)/m4/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/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/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac @@ -196,7 +199,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EOVERFLOW = @EOVERFLOW@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FCNTL_H = @FCNTL_H@ FLOAT_H = @FLOAT_H@ @@ -206,30 +215,47 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_DIRFD = @GNULIB_DIRFD@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ GNULIB_FTELLO = @GNULIB_FTELLO@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FWRITE = @GNULIB_FWRITE@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ @@ -250,15 +276,26 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ GNULIB_STPCPY = @GNULIB_STPCPY@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ @@ -274,25 +311,35 @@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ATOLL = @HAVE_ATOLL@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ +HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ +HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ @@ -306,22 +353,31 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DUP2 = @HAVE_DUP2@ +HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ +HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ +HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_IO_H = @HAVE_IO_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_R = @HAVE_RANDOM_R@ +HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_RPMATCH = @HAVE_RPMATCH@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -337,10 +393,15 @@ HAVE_STRNDUP = @HAVE_STRNDUP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOLL = @HAVE_STRTOLL@ +HAVE_STRTOULL = @HAVE_STRTOULL@ +HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ +HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ @@ -382,6 +443,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -407,13 +469,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ +PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ REPLACE_CHOWN = @REPLACE_CHOWN@ +REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ +REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -426,18 +491,25 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ +REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRPTIME = @REPLACE_STRPTIME@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ @@ -450,6 +522,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -465,6 +538,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ diff --git a/NEWS b/NEWS index a9036d5..41b30ea 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,73 @@ -GNU tar NEWS - User visible changes. 2008-04-14 +GNU tar NEWS - User visible changes. 2008-12-27 Please send GNU tar bug reports to +version 1.21 - Sergey Poznyakoff, 2008-12-27 + +* New short option -J + +A shortcut for --lzma. + +* New option --lzop + +* New option --no-auto-compress + +Cancels the effect of previous --auto-compress (-a) option. + +* New option --no-null + +Cancels the effect of previous --null option. + +* Compressed format recognition + +If tar is unable to determine archive compression format, it falls +back to using archive suffix to determine it. + +* VCS support. + +Using --exclude-vcs handles also files used internally by Bazaar, +Mercurial and Darcs. + +* Transformation scope flags + +Name transformation expressions understand additional flags that +control type of archive members affected by them. The flags are: + + - r + Apply transformation to regular archive members. + + - s + Apply transformation to symbolic link targets. + + - h + Apply transformation to hard link targets. + +Corresponding upper-case letters negate the meaning, so that +`H' means ``do not apply transformation to hard link targets.'' + +The scope flags are listed in the third part of an `s' expression, +e.g.: + + tar --transform 's|^|/usr/local/|S' + +Default is `rsh', which means that transformations are applied to +both regular archive members and to the targets of symbolic and hard +links. If several transform expressions are used, the default flags +can be changed using `flags=' statement before the expressions, e.g.: + + tar --transform 'flags=S;s|^|/usr/local/|S' + +* Bugfixes + +** The --null option disabled handling of tar options in list files. This +is fixed. +** Fixed record size autodetection. If detected record size differs from +the expected value (either default, or set on the command line), tar +always prints a warning if verbosity level is set to 1 or greater, +i.e. if either -t or -v option is given. + + + version 1.20 - Sergey Poznyakoff, 2008-04-14 * New option --auto-compress (-a) diff --git a/THANKS b/THANKS index 1b40c3e..dbb64d2 100644 --- a/THANKS +++ b/THANKS @@ -102,9 +102,11 @@ Clinton Carr clint@netcom.com Conrad Hughes chughes@maths.tcd.ie Constantin Belous const@cris.net Coranth Gryphon gryphon@bur.visidyne.com +Cyril Strejc strejc@unicontrols.cz Dale R. Worley worley@world.std.com Dale Wiles wiles@geordi.calspan.com Dan Bloch dan@transarc.com +Dan Drake dan@dandrake.org Dan Reish dreish@izzy.net Daniel Hagerty hag@gnu.org Daniel Quinlan quinlan@pathname.com @@ -145,12 +147,14 @@ Drew Sullivan drew@sni.ca Drew Trieger trieger@woodstock.abbott.com Dunstan Vavasour dev@cegelecproj.co.uk Ed Childs echilds@bgs.com +Ed Leaver ewleaver@comcast.net Edgar Taube et@immd8.informatik.uni-erlangen.de Eduardo Kortright eduardo@cs.ua.edu Eduardo V. de Rivas eddie@asterion.com Edward Welbourne eddy@gen.cam.ac.uk Elmar Heeb heeb@itp.ethz.ch Elmer Fittery elmerf@ptw.com +Enric Hernandez ehernandez@notariado.org Eric Backus ericb@lsid.hp.com Eric Benson eb@amazon.com Eric Blake ebb9@byu.net diff --git a/aclocal.m4 b/aclocal.m4 index bfc23db..af762e3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1021,9 +1021,11 @@ m4_include([m4/chdir-long.m4]) m4_include([m4/chown.m4]) m4_include([m4/clock_time.m4]) m4_include([m4/close-stream.m4]) +m4_include([m4/close.m4]) m4_include([m4/closeout.m4]) m4_include([m4/codeset.m4]) m4_include([m4/d-ino.m4]) +m4_include([m4/dirent_h.m4]) m4_include([m4/dirfd.m4]) m4_include([m4/dirname.m4]) m4_include([m4/dos.m4]) @@ -1031,12 +1033,13 @@ m4_include([m4/double-slash-root.m4]) m4_include([m4/dup2.m4]) m4_include([m4/eealloc.m4]) m4_include([m4/environ.m4]) -m4_include([m4/eoverflow.m4]) +m4_include([m4/errno_h.m4]) m4_include([m4/error.m4]) m4_include([m4/exclude.m4]) m4_include([m4/exitfail.m4]) m4_include([m4/extensions.m4]) m4_include([m4/fchdir.m4]) +m4_include([m4/fclose.m4]) m4_include([m4/fcntl-safer.m4]) m4_include([m4/fcntl_h.m4]) m4_include([m4/fileblocks.m4]) @@ -1093,13 +1096,16 @@ m4_include([m4/mkdtemp.m4]) m4_include([m4/mktime.m4]) m4_include([m4/modechange.m4]) m4_include([m4/nls.m4]) +m4_include([m4/open.m4]) m4_include([m4/openat.m4]) m4_include([m4/pathmax.m4]) m4_include([m4/paxutils.m4]) m4_include([m4/po.m4]) +m4_include([m4/printf.m4]) m4_include([m4/progtest.m4]) m4_include([m4/quote.m4]) m4_include([m4/quotearg.m4]) +m4_include([m4/rawmemchr.m4]) m4_include([m4/readlink.m4]) m4_include([m4/realloc.m4]) m4_include([m4/regex.m4]) @@ -1162,6 +1168,7 @@ m4_include([m4/wchar_t.m4]) m4_include([m4/wctype.m4]) m4_include([m4/wcwidth.m4]) m4_include([m4/wint_t.m4]) +m4_include([m4/write.m4]) m4_include([m4/xalloc.m4]) m4_include([m4/xgetcwd.m4]) m4_include([m4/xsize.m4]) diff --git a/build-aux/config.guess b/build-aux/config.guess index 6603908..f0f0d36 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-03-12' +timestamp='2008-09-28' # 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 @@ -796,7 +796,7 @@ EOF x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -935,6 +935,9 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -985,9 +988,6 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 35f959b..85c2f20 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -47,7 +47,7 @@ for cc_temp in $CC""; do done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ else ;; esac ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -76,7 +76,13 @@ else ;; linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -124,7 +130,7 @@ else esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -132,7 +138,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -326,7 +332,7 @@ else ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -494,7 +500,7 @@ else fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. # Unlike libtool.m4, here we don't care about _all_ names of the library, but # only about the one the linker finds when passed -lNAME. This is the last # element of library_names_spec in libtool.m4, or possibly two of them if the @@ -517,7 +523,7 @@ case "$host_os" in bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; diff --git a/build-aux/config.sub b/build-aux/config.sub index 087f29b..053e738 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-03-26' +timestamp='2008-09-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -288,7 +288,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -375,7 +375,7 @@ case $basic_machine in | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -463,6 +463,10 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -530,6 +534,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1132,6 +1140,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1252,7 +1264,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1392,6 +1404,9 @@ case $os in -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 175c320..1901d68 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2008-03-31.10} +\def\texinfoversion{2008-10-30.07} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -650,8 +650,8 @@ \def\jmacro{j} \def\dotless#1{% \def\temp{#1}% - \ifx\temp\imacro \ptexi - \else\ifx\temp\jmacro \j + \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi + \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi \else \errmessage{@dotless can be used only with i or j}% \fi\fi } @@ -924,8 +924,9 @@ where each line of input produces a line of output.} \pushthisfilestack \def\thisfile{#1}% {% - \makevalueexpandable % we want to expand any @value in FILE. + \makevalueexpandable % we want to expand any @value in FILE. \turnoffactive % and allow special characters in the expansion + \indexnofonts % Allow `@@' and other weird things in file names. \edef\temp{\noexpand\input #1 }% % % This trickery is to read FILE outside of a group, in case it makes @@ -1119,6 +1120,16 @@ where each line of input produces a line of output.} \mathunderscore \let\\ = \mathbackslash \mathactive + % make the texinfo accent commands work in math mode + \let\"=\ddot + \let\'=\acute + \let\==\bar + \let\^=\hat + \let\`=\grave + \let\u=\breve + \let\v=\check + \let\~=\tilde + \let\dotaccent=\dot $\finishmath } \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. @@ -1140,9 +1151,11 @@ where each line of input produces a line of output.} } } -% @bullet and @minus need the same treatment as @math, just above. +% Some math mode symbols. \def\bullet{$\ptexbullet$} -\def\minus{$-$} +\def\geq{\ifmmode \ge\else $\ge$\fi} +\def\leq{\ifmmode \le\else $\le$\fi} +\def\minus{\ifmmode -\else $-$\fi} % @dots{} outputs an ellipsis using the current font. % We do .5em per period so that it has the same spacing in the cm @@ -2477,6 +2490,7 @@ end { \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active \catcode`\`=\active + \global\let'=\rq \global\let`=\lq % default definitions % \global\def\code{\begingroup \catcode\rquoteChar=\active \catcode\lquoteChar=\active @@ -3862,11 +3876,11 @@ end \def\dosynindex#1#2#3{% % Only do \closeout if we haven't already done it, else we'll end up % closing the target index. - \expandafter \ifx\csname donesynindex#2\endcsname \undefined + \expandafter \ifx\csname donesynindex#2\endcsname \relax % The \closeout helps reduce unnecessary open files; the limit on the % Acorn RISC OS is a mere 16 files. \expandafter\closeout\csname#2indfile\endcsname - \expandafter\let\csname\donesynindex#2\endcsname = 1 + \expandafter\let\csname donesynindex#2\endcsname = 1 \fi % redefine \fooindfile: \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname @@ -5958,7 +5972,7 @@ end % we're doing normal filling. So, when using \aboveenvbreak and % \afterenvbreak, temporarily make \parskip 0. % -\envdef\quotation{% +\def\quotationstart{% {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip \parindent=0pt % @@ -5973,6 +5987,17 @@ end \parsearg\quotationlabel } +\envdef\quotation{% + \setnormaldispenv + \quotationstart +} + +\envdef\smallquotation{% + \setsmalldispenv + \quotationstart +} +\let\Esmallquotation = \Equotation + % We have retained a nonzero parskip for the environment, since we're % doing normal filling. % @@ -6014,12 +6039,6 @@ end \def\uncatcodespecials{% \def\do##1{\catcode`##1=\other}\dospecials} % -% [Knuth] pp. 380,381,391 -% Disable Spanish ligatures ?` and !` of \tt font -\begingroup - \catcode`\`=\active\gdef`{\relax\lq} -\endgroup -% % Setup for the @verb command. % % Eight spaces for a tab @@ -6069,7 +6088,7 @@ end \def\codequoteleft{% \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - `% + \relax`% the \relax disables the `! and `? ligatures \else \char'22 \fi \else \char'22 \fi } @@ -6164,6 +6183,7 @@ end {% \makevalueexpandable \setupverbatim + \indexnofonts % Allow `@@' and other weird things in file names. \input #1 \afterenvbreak }% @@ -7735,10 +7755,9 @@ end \message{localization,} -% @documentlanguage is usually given very early, just after -% @setfilename. If done too late, it may not override everything -% properly. Single argument is the language (de) or locale (de_DE) -% abbreviation. It would be nice if we could set up a hyphenation file. +% For single-language documents, @documentlanguage is usually given very +% early, just after @documentencoding. Single argument is the language +% (de) or locale (de_DE) abbreviation. % { \catcode`\_ = \active @@ -7751,10 +7770,11 @@ end \ifeof 1 \documentlanguagetrywithoutunderscore{#1_\finish}% \else + \globaldefs = 1 % everything in the txi-LL files needs to persist \input txi-#1.tex \fi \closein 1 - \endgroup + \endgroup % end raw TeX \endgroup} } % @@ -7773,9 +7793,36 @@ end } % \newhelp\nolanghelp{The given language definition file cannot be found or -is empty. Maybe you need to install it? In the current directory -should work if nowhere else does.} +is empty. Maybe you need to install it? Putting it in the current +directory should work if nowhere else does.} +% This macro is called from txi-??.tex files; the first argument is the +% \language name to set (without the "\lang@" prefix), the second and +% third args are \{left,right}hyphenmin. +% +% The language names to pass are determined when the format is built. +% See the etex.log file created at that time, e.g., +% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. +% +% With TeX Live 2008, etex now includes hyphenation patterns for all +% available languages. This means we can support hyphenation in +% Texinfo, at least to some extent. (This still doesn't solve the +% accented characters problem.) +% +\catcode`@=11 +\def\txisetlanguage#1#2#3{% + % do not set the language if the name is undefined in the current TeX. + \expandafter\ifx\csname lang@#1\endcsname \relax + \message{no patterns for #1}% + \else + \global\language = \csname lang@#1\endcsname + \fi + % but there is no harm in adjusting the hyphenmin values regardless. + \global\lefthyphenmin = #2\relax + \global\righthyphenmin = #3\relax +} + +% Helpers for encodings. % Set the catcode of characters 128 through 255 to the specified number. % \def\setnonasciicharscatcode#1{% @@ -8969,7 +9016,14 @@ should work if nowhere else does.} @catcode`@# = @other @catcode`@% = @other - +@c Finally, make ` and ' active, so that txicodequoteundirected and +@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we +@c don't make ` and ' active, @code will not get them as active chars. +@c Do this last of all since we use ` in the previous @catcode assignments. +@c (not ready yet, sigh) +@c atcode`@'=@active @let'@rq +@c atcode`@`=@active @let`@lq + @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) @c page-delimiter: "^\\\\message" diff --git a/config.hin b/config.hin index 3f576f3..3607fc1 100644 --- a/config.hin +++ b/config.hin @@ -71,9 +71,6 @@ language is requested. */ #undef ENABLE_NLS -/* Define as good substitute value for EOVERFLOW. */ -#undef EOVERFLOW - /* Define if gnulib's fchdir() replacement is used. */ #undef FCHDIR_REPLACEMENT @@ -96,6 +93,9 @@ /* Define to make the limit macros in visible. */ #undef GL_TRIGGER_STDC_LIMIT_MACROS +/* Define to 1 when using the gnulib module canonicalize-lgpl. */ +#undef GNULIB_CANONICALIZE_LGPL + /* Define to 1 when using the gnulib module close-stream. */ #undef GNULIB_CLOSE_STREAM @@ -105,6 +105,9 @@ /* Define to indicate the 'malloc' module. */ #undef GNULIB_MALLOC_GNU +/* Define to 1 when using the gnulib module open. */ +#undef GNULIB_OPEN + /* Define to 1 to add extern declaration of program_invocation_name to argp.h */ #undef GNULIB_PROGRAM_INVOCATION_NAME @@ -252,10 +255,6 @@ don't. */ #undef HAVE_DECL_MEMRCHR -/* Define to 1 if you have the declaration of `mkdir', and to 0 if you don't. - */ -#undef HAVE_DECL_MKDIR - /* Define if program_invocation_name is declared */ #undef HAVE_DECL_PROGRAM_INVOCATION_NAME @@ -270,6 +269,10 @@ don't. */ #undef HAVE_DECL_PUTC_UNLOCKED +/* Define to 1 if you have the declaration of `sleep', and to 0 if you don't. + */ +#undef HAVE_DECL_SLEEP + /* Define to 1 if you have the declaration of `snprintf', and to 0 if you don't. */ #undef HAVE_DECL_SNPRINTF @@ -350,6 +353,9 @@ /* Define if you have the declaration of environ. */ #undef HAVE_ENVIRON_DECL +/* Define to 1 if you have the header file. */ +#undef HAVE_ERRNO_H + /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -383,6 +389,9 @@ /* Define to 1 if you have the `funlockfile' function. */ #undef HAVE_FUNLOCKFILE +/* Define to 1 if you have the `futimens' function. */ +#undef HAVE_FUTIMENS + /* Define to 1 if you have the `futimes' function. */ #undef HAVE_FUTIMES @@ -422,9 +431,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ICONV_H -/* Define if your compiler supports the #include_next directive. */ -#undef HAVE_INCLUDE_NEXT - /* Define to 1 if the compiler supports one of the keywords 'inline', '__inline__', '__inline' and effectively inlines functions marked as such. */ @@ -440,9 +446,6 @@ declares uintmax_t. */ #undef HAVE_INTTYPES_H_WITH_UINTMAX -/* Define to 1 if you have the header file. */ -#undef HAVE_IO_H - /* Define to 1 if you have the `isblank' function. */ #undef HAVE_ISBLANK @@ -455,12 +458,18 @@ /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET +/* Define if you have and nl_langinfo(YESEXPR). */ +#undef HAVE_LANGINFO_YESEXPR + /* Define to 1 if you have the `lchmod' function. */ #undef HAVE_LCHMOD /* Define to 1 if you have the `lchown' function. */ #undef HAVE_LCHOWN +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBINTL_H + /* Define to 1 if you have the header file. */ #undef HAVE_LINEWRAP_H @@ -567,6 +576,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H +/* Define to 1 if you have the `rawmemchr' function. */ +#undef HAVE_RAWMEMCHR + /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK @@ -600,9 +612,6 @@ /* Define to 1 if 'wint_t' is a signed integer type. */ #undef HAVE_SIGNED_WINT_T -/* Define to 1 if you have the `sleep' function. */ -#undef HAVE_SLEEP - /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF @@ -676,6 +685,9 @@ /* Define to 1 if you have the `strtoumax' function. */ #undef HAVE_STRTOUMAX +/* Define to 1 if the system has the type `struct random_data'. */ +#undef HAVE_STRUCT_RANDOM_DATA + /* Define to 1 if `st_atimensec' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_ATIMENSEC @@ -765,6 +777,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H @@ -812,6 +827,9 @@ /* Define to 1 if the system has the type `unsigned long long int'. */ #undef HAVE_UNSIGNED_LONG_LONG_INT +/* Define to 1 if you have the `utimensat' function. */ +#undef HAVE_UTIMENSAT + /* Define to 1 if you have the `utimes' function. */ #undef HAVE_UTIMES @@ -854,6 +872,9 @@ /* Define to 1 if you have the `wcwidth' function. */ #undef HAVE_WCWIDTH +/* Define to 1 if you have the header file. */ +#undef HAVE_WINSOCK2_H + /* Define if you have the 'wint_t' type. */ #undef HAVE_WINT_T @@ -917,6 +938,9 @@ /* 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 + /* Name of package */ #undef PACKAGE @@ -1111,6 +1135,16 @@ /* Define to long or long long if and don't define. */ #undef intmax_t +/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports + the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of + earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. + __APPLE__ && __MACH__ test for MacOS X. + __APPLE_CC__ tests for the Apple compiler and its version. + __STDC_VERSION__ tests for the C99 mode. */ +#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ +# define __GNUC_STDC_INLINE__ 1 +#endif + /* Define to rpl_localtime if the replacement function should be used. */ #undef localtime @@ -1132,6 +1166,9 @@ /* Define to `int' if does not define. */ #undef mode_t +/* Define to the type of st_nlink in struct stat, or a supertype. */ +#undef nlink_t + /* Define to `long int' if does not define. */ #undef off_t @@ -1215,6 +1252,16 @@ /* Define to `int' if doesn't define. */ #undef uid_t +/* Define as a marker that can be attached to function parameter declarations + for parameters that are not used. This helps to reduce warnings, such as + from GCC -Wunused-parameter. */ +#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _UNUSED_PARAMETER_ __attribute__ ((__unused__)) +#else +# define _UNUSED_PARAMETER_ +#endif + + /* Define to rpl_utime if the replacement function should be used. */ #undef utime diff --git a/configure b/configure index cb1ddae..f9c548b 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.61 for GNU tar 1.20. +# Generated by GNU Autoconf 2.61 for GNU tar 1.21. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU tar' PACKAGE_TARNAME='tar' -PACKAGE_VERSION='1.20' -PACKAGE_STRING='GNU tar 1.20' +PACKAGE_VERSION='1.21' +PACKAGE_STRING='GNU tar 1.21' PACKAGE_BUGREPORT='bug-tar@gnu.org' ac_unique_file="src/tar.c" @@ -703,25 +703,39 @@ STDBOOL_H HAVE__BOOL GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE -EOVERFLOW ALLOCA ALLOCA_H GETOPT_H GNULIB_CHOWN +GNULIB_CLOSE GNULIB_DUP2 GNULIB_ENVIRON +GNULIB_EUIDACCESS GNULIB_FCHDIR +GNULIB_FSYNC GNULIB_FTRUNCATE GNULIB_GETCWD +GNULIB_GETDOMAINNAME +GNULIB_GETDTABLESIZE +GNULIB_GETHOSTNAME GNULIB_GETLOGIN_R GNULIB_GETPAGESIZE +GNULIB_GETUSERSHELL GNULIB_LCHOWN GNULIB_LSEEK GNULIB_READLINK GNULIB_SLEEP +GNULIB_UNISTD_H_SIGPIPE +GNULIB_WRITE HAVE_DUP2 +HAVE_EUIDACCESS +HAVE_FSYNC HAVE_FTRUNCATE +HAVE_GETDOMAINNAME +HAVE_GETDTABLESIZE +HAVE_GETHOSTNAME HAVE_GETPAGESIZE +HAVE_GETUSERSHELL HAVE_READLINK HAVE_SLEEP HAVE_DECL_ENVIRON @@ -729,12 +743,21 @@ HAVE_DECL_GETLOGIN_R HAVE_OS_H HAVE_SYS_PARAM_H REPLACE_CHOWN +REPLACE_CLOSE REPLACE_FCHDIR REPLACE_GETCWD REPLACE_GETPAGESIZE REPLACE_LCHOWN REPLACE_LSEEK +REPLACE_WRITE +UNISTD_H_HAVE_WINSOCK2_H LIB_CLOCK_GETTIME +GNULIB_DIRFD +HAVE_DECL_DIRFD +DIRENT_H +INCLUDE_NEXT +PRAGMA_SYSTEM_HEADER +NEXT_DIRENT_H build build_cpu build_vendor @@ -743,25 +766,31 @@ host host_cpu host_vendor host_os -INCLUDE_NEXT -NEXT_DIRENT_H -DIRENT_H +NEXT_ERRNO_H +ERRNO_H +EMULTIHOP_HIDDEN +EMULTIHOP_VALUE +ENOLINK_HIDDEN +ENOLINK_VALUE +EOVERFLOW_HIDDEN +EOVERFLOW_VALUE GNULIB_OPEN REPLACE_OPEN -NEXT_FCNTL_H -FCNTL_H -NEXT_FLOAT_H -FLOAT_H -FNMATCH_H +GNULIB_FPRINTF GNULIB_FPRINTF_POSIX +GNULIB_PRINTF GNULIB_PRINTF_POSIX GNULIB_SNPRINTF GNULIB_SPRINTF_POSIX +GNULIB_VFPRINTF GNULIB_VFPRINTF_POSIX +GNULIB_VPRINTF GNULIB_VPRINTF_POSIX GNULIB_VSNPRINTF GNULIB_VSPRINTF_POSIX GNULIB_VASPRINTF +GNULIB_OBSTACK_PRINTF +GNULIB_OBSTACK_PRINTF_POSIX GNULIB_FOPEN GNULIB_FREOPEN GNULIB_FSEEK @@ -769,8 +798,18 @@ GNULIB_FSEEKO GNULIB_FTELL GNULIB_FTELLO GNULIB_FFLUSH +GNULIB_FCLOSE +GNULIB_FPUTC +GNULIB_PUTC +GNULIB_PUTCHAR +GNULIB_FPUTS +GNULIB_PUTS +GNULIB_FWRITE GNULIB_GETDELIM GNULIB_GETLINE +GNULIB_PERROR +GNULIB_STDIO_H_SIGPIPE +REPLACE_STDIO_WRITE_FUNCS REPLACE_FPRINTF REPLACE_VFPRINTF REPLACE_PRINTF @@ -783,6 +822,8 @@ REPLACE_SPRINTF REPLACE_VSPRINTF HAVE_VASPRINTF REPLACE_VASPRINTF +HAVE_DECL_OBSTACK_PRINTF +REPLACE_OBSTACK_PRINTF REPLACE_FOPEN REPLACE_FREOPEN HAVE_FSEEKO @@ -792,9 +833,16 @@ HAVE_FTELLO REPLACE_FTELLO REPLACE_FTELL REPLACE_FFLUSH +REPLACE_FCLOSE HAVE_DECL_GETDELIM HAVE_DECL_GETLINE REPLACE_GETLINE +REPLACE_PERROR +NEXT_FCNTL_H +FCNTL_H +NEXT_FLOAT_H +FLOAT_H +FNMATCH_H LIBINTL LTLIBINTL NEXT_SYS_TIME_H @@ -842,24 +890,43 @@ UINT64_MAX_EQ_ULONG_MAX INTTYPES_H GLIBC21 LOCALCHARSET_TESTS_ENVIRONMENT +GNULIB_LCHMOD +GNULIB_LSTAT +HAVE_LCHMOD +REPLACE_LSTAT +REPLACE_MKDIR HAVE_MALLOC_POSIX GNULIB_MALLOC_POSIX GNULIB_REALLOC_POSIX GNULIB_CALLOC_POSIX +GNULIB_ATOLL +GNULIB_GETLOADAVG GNULIB_GETSUBOPT GNULIB_MKDTEMP GNULIB_MKSTEMP GNULIB_PUTENV +GNULIB_RANDOM_R +GNULIB_RPMATCH GNULIB_SETENV GNULIB_STRTOD +GNULIB_STRTOLL +GNULIB_STRTOULL GNULIB_UNSETENV +HAVE_ATOLL HAVE_CALLOC_POSIX HAVE_GETSUBOPT HAVE_MKDTEMP HAVE_REALLOC_POSIX +HAVE_RANDOM_R +HAVE_RPMATCH HAVE_SETENV HAVE_STRTOD +HAVE_STRTOLL +HAVE_STRTOULL +HAVE_STRUCT_RANDOM_DATA +HAVE_SYS_LOADAVG_H HAVE_UNSETENV +HAVE_DECL_GETLOADAVG REPLACE_MKSTEMP REPLACE_PUTENV REPLACE_STRTOD @@ -867,6 +934,7 @@ VOID_UNSETENV GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR +GNULIB_RAWMEMCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL @@ -894,9 +962,11 @@ GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL +GNULIB_STRVERSCMP HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR +HAVE_RAWMEMCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL @@ -910,11 +980,13 @@ HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL -REPLACE_STRERROR -REPLACE_STRSIGNAL +HAVE_STRVERSCMP REPLACE_MEMMEM -REPLACE_STRCASESTR +REPLACE_STRDUP REPLACE_STRSTR +REPLACE_STRCASESTR +REPLACE_STRERROR +REPLACE_STRSIGNAL STDARG_H NEXT_STDARG_H NEXT_STDIO_H @@ -924,8 +996,6 @@ HAVE_DECL_STRNCASECMP NEXT_STRING_H NEXT_STRINGS_H HAVE_LSTAT -HAVE_DECL_MKDIR -HAVE_IO_H NEXT_SYS_STAT_H SYS_STAT_H NEXT_SYSEXITS_H @@ -944,13 +1014,14 @@ GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H +HAVE_WINT_T HAVE_WCHAR_H NEXT_WCHAR_H HAVE_ISWCNTRL -HAVE_WINT_T NEXT_WCTYPE_H HAVE_WCTYPE_H WCTYPE_H +REPLACE_ISWCNTRL LIBTAR_LIBDEPS LIBTAR_LTLIBDEPS LIB_SETSOCKOPT @@ -1505,7 +1576,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.20 to adapt to many kinds of systems. +\`configure' configures GNU tar 1.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1575,7 +1646,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU tar 1.20:";; + short | recursive ) echo "Configuration of GNU tar 1.21:";; esac cat <<\_ACEOF @@ -1700,7 +1771,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU tar configure 1.20 +GNU tar configure 1.21 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1714,7 +1785,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.20, which was +It was created by GNU tar $as_me 1.21, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2014,9 +2085,10 @@ ac_func_list="$ac_func_list pathconf" ac_func_list="$ac_func_list canonicalize_file_name" ac_func_list="$ac_func_list getcwd" ac_func_list="$ac_func_list readlink" +ac_header_list="$ac_header_list dirent.h" ac_func_list="$ac_func_list dup2" +ac_header_list="$ac_header_list errno.h" ac_func_list="$ac_func_list fchdir" -ac_header_list="$ac_header_list dirent.h" ac_header_list="$ac_header_list float.h" ac_func_list="$ac_func_list btowc" ac_func_list="$ac_func_list isblank" @@ -2043,10 +2115,10 @@ ac_func_list="$ac_func_list mbrtowc" ac_func_list="$ac_func_list wcrtomb" ac_func_list="$ac_func_list wcscoll" ac_func_list="$ac_func_list setenv" -ac_func_list="$ac_func_list sleep" ac_header_list="$ac_header_list stdarg.h" ac_header_list="$ac_header_list stdio.h" ac_header_list="$ac_header_list stdlib.h" +ac_header_list="$ac_header_list sys/socket.h" ac_header_list="$ac_header_list strings.h" ac_func_list="$ac_func_list lstat" ac_header_list="$ac_header_list sys/stat.h" @@ -2057,6 +2129,8 @@ ac_header_list="$ac_header_list priv.h" ac_header_list="$ac_header_list utime.h" ac_func_list="$ac_func_list futimes" ac_func_list="$ac_func_list futimesat" +ac_func_list="$ac_func_list futimens" +ac_func_list="$ac_func_list utimensat" ac_func_list="$ac_func_list vasnprintf" ac_func_list="$ac_func_list iswcntrl" ac_func_list="$ac_func_list wcwidth" @@ -2488,7 +2562,7 @@ fi # Define the identity of the package. PACKAGE='tar' - VERSION='1.20' + VERSION='1.21' cat >>confdefs.h <<_ACEOF @@ -8009,6 +8083,12 @@ _ACEOF # gnulib modules + + + + + + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { echo "$as_me:$LINENO: checking for working alloca.h" >&5 @@ -9849,20 +9929,35 @@ fi GNULIB_CHOWN=0; + GNULIB_CLOSE=0; GNULIB_DUP2=0; GNULIB_ENVIRON=0; + GNULIB_EUIDACCESS=0; GNULIB_FCHDIR=0; + GNULIB_FSYNC=0; GNULIB_FTRUNCATE=0; GNULIB_GETCWD=0; + GNULIB_GETDOMAINNAME=0; + GNULIB_GETDTABLESIZE=0; + GNULIB_GETHOSTNAME=0; GNULIB_GETLOGIN_R=0; GNULIB_GETPAGESIZE=0; + GNULIB_GETUSERSHELL=0; GNULIB_LCHOWN=0; GNULIB_LSEEK=0; GNULIB_READLINK=0; GNULIB_SLEEP=0; + GNULIB_UNISTD_H_SIGPIPE=0; + GNULIB_WRITE=0; HAVE_DUP2=1; + HAVE_EUIDACCESS=1; + HAVE_FSYNC=1; HAVE_FTRUNCATE=1; + HAVE_GETDOMAINNAME=1; + HAVE_GETDTABLESIZE=1; + HAVE_GETHOSTNAME=1; HAVE_GETPAGESIZE=1; + HAVE_GETUSERSHELL=1; HAVE_READLINK=1; HAVE_SLEEP=1; HAVE_DECL_ENVIRON=1; @@ -9870,11 +9965,14 @@ fi HAVE_OS_H=0; HAVE_SYS_PARAM_H=0; REPLACE_CHOWN=0; + REPLACE_CLOSE=0; REPLACE_FCHDIR=0; REPLACE_GETCWD=0; REPLACE_GETPAGESIZE=0; REPLACE_LCHOWN=0; REPLACE_LSEEK=0; + REPLACE_WRITE=0; + UNISTD_H_HAVE_WINSOCK2_H=0; for ac_header in unistd.h @@ -10189,6 +10287,87 @@ _ACEOF fi + + GNULIB_DIRFD=0; + HAVE_DECL_DIRFD=1; + DIRENT_H=''; + + + + { echo "$as_me:$LINENO: checking whether the preprocessor supports include_next" >&5 +echo $ECHO_N "checking whether the preprocessor supports include_next... $ECHO_C" >&6; } +if test "${gl_cv_have_include_next+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + rm -rf conftestd1 conftestd2 + mkdir conftestd1 conftestd2 + cat < conftestd1/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include +#include_next +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat < conftestd2/conftest.h +#ifndef DEFINED_IN_CONFTESTD1 +#error "include_next test doesn't work" +#endif +#define DEFINED_IN_CONFTESTD2 +EOF + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2" + cat >conftest.$ac_ext <<_ACEOF +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gl_cv_have_include_next=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_have_include_next=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$save_CPPFLAGS" + rm -rf conftestd1 conftestd2 + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_have_include_next" >&5 +echo "${ECHO_T}$gl_cv_have_include_next" >&6; } + PRAGMA_SYSTEM_HEADER= + if test $gl_cv_have_include_next = yes; then + INCLUDE_NEXT=include_next + if test -n "$GCC"; then + PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' + fi + else + INCLUDE_NEXT=include + fi + + + + + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 @@ -10315,191 +10494,190 @@ _ACEOF -{ echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5 -echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_strerror_r+set}" = set; then + + + + + { echo "$as_me:$LINENO: checking for complete errno.h" >&5 +echo $ECHO_N "checking for complete errno.h... $ECHO_C" >&6; } +if test "${gl_cv_header_errno_h_complete+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef strerror_r - (void) strerror_r; + +#include +#if !defined ENOMSG +booboo +#endif +#if !defined EIDRM +booboo +#endif +#if !defined ENOLINK +booboo +#endif +#if !defined EPROTO +booboo +#endif +#if !defined EMULTIHOP +booboo +#endif +#if !defined EBADMSG +booboo +#endif +#if !defined EOVERFLOW +booboo +#endif +#if !defined ENOTSUP +booboo +#endif +#if !defined ECANCELED +booboo #endif - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_strerror_r=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "booboo" >/dev/null 2>&1; then + gl_cv_header_errno_h_complete=no else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_strerror_r=no + gl_cv_header_errno_h_complete=yes fi +rm -f conftest* + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6; } -if test $ac_cv_have_decl_strerror_r = yes; then +{ echo "$as_me:$LINENO: result: $gl_cv_header_errno_h_complete" >&5 +echo "${ECHO_T}$gl_cv_header_errno_h_complete" >&6; } + if test $gl_cv_header_errno_h_complete = yes; then + ERRNO_H='' + else -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRERROR_R 1 -_ACEOF -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRERROR_R 0 -_ACEOF -fi -for ac_func in strerror_r -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_errno_h='<'errno.h'>' + else + { echo "$as_me:$LINENO: checking absolute name of " >&5 +echo $ECHO_N "checking absolute name of ... $ECHO_C" >&6; } +if test "${gl_cv_next_errno_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + if test $ac_cv_header_errno_h = yes; then + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func +#include -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ +_ACEOF + gl_cv_next_errno_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/errno.h#{ + s#.*"\(.*/errno.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_errno_h='<'errno.h'>' + fi -#ifdef __STDC__ -# include -#else -# include -#endif +fi +{ echo "$as_me:$LINENO: result: $gl_cv_next_errno_h" >&5 +echo "${ECHO_T}$gl_cv_next_errno_h" >&6; } + fi + NEXT_ERRNO_H=$gl_cv_next_errno_h -#undef $ac_func -/* 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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me + + ERRNO_H='errno.h' + fi + + + if test -n "$ERRNO_H"; then + { echo "$as_me:$LINENO: checking for EMULTIHOP value" >&5 +echo $ECHO_N "checking for EMULTIHOP value... $ECHO_C" >&6; } +if test "${gl_cv_header_errno_h_EMULTIHOP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifdef EMULTIHOP +yes #endif -int -main () -{ -return $ac_func (); - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + gl_cv_header_errno_h_EMULTIHOP=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" + gl_cv_header_errno_h_EMULTIHOP=no fi +rm -f conftest* -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + if test $gl_cv_header_errno_h_EMULTIHOP = no; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi -done +#define _XOPEN_SOURCE_EXTENDED 1 +#include +#ifdef EMULTIHOP +yes +#endif -{ echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5 -echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6; } -if test "${ac_cv_func_strerror_r_char_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + gl_cv_header_errno_h_EMULTIHOP=hidden +fi +rm -f conftest* - ac_cv_func_strerror_r_char_p=no - if test $ac_cv_have_decl_strerror_r = yes; then - cat >conftest.$ac_ext <<_ACEOF + if test $gl_cv_header_errno_h_EMULTIHOP = hidden; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + int main () { - - char buf[100]; - char x = *strerror_r (0, buf, sizeof buf); - char *p = strerror_r (0, buf, sizeof buf); - return !p || x; +static int test_array [1 - 2 * !((EMULTIHOP) >= 0)]; +test_array [0] = 0 ; return 0; @@ -10522,117 +10700,1024 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_func_strerror_r_char_p=yes + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((EMULTIHOP) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((EMULTIHOP) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((EMULTIHOP) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((EMULTIHOP) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) gl_cv_header_errno_h_EMULTIHOP=$ac_lo;; +'') ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +static long int longval () { return EMULTIHOP; } +static unsigned long int ulongval () { return EMULTIHOP; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if ((EMULTIHOP) < 0) + { + long int i = longval (); + if (i != (EMULTIHOP)) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != (EMULTIHOP)) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_header_errno_h_EMULTIHOP=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val + fi + fi + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_header_errno_h_EMULTIHOP" >&5 +echo "${ECHO_T}$gl_cv_header_errno_h_EMULTIHOP" >&6; } + case $gl_cv_header_errno_h_EMULTIHOP in + yes | no) + EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE= + ;; + *) + EMULTIHOP_HIDDEN=1; EMULTIHOP_VALUE="$gl_cv_header_errno_h_EMULTIHOP" + ;; + esac + + + fi + + + if test -n "$ERRNO_H"; then + { echo "$as_me:$LINENO: checking for ENOLINK value" >&5 +echo $ECHO_N "checking for ENOLINK value... $ECHO_C" >&6; } +if test "${gl_cv_header_errno_h_ENOLINK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifdef ENOLINK +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + gl_cv_header_errno_h_ENOLINK=yes +else + gl_cv_header_errno_h_ENOLINK=no +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_ENOLINK = no; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +#ifdef ENOLINK +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + gl_cv_header_errno_h_ENOLINK=hidden +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_ENOLINK = hidden; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((ENOLINK) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((ENOLINK) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((ENOLINK) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((ENOLINK) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((ENOLINK) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) gl_cv_header_errno_h_ENOLINK=$ac_lo;; +'') ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +static long int longval () { return ENOLINK; } +static unsigned long int ulongval () { return ENOLINK; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if ((ENOLINK) < 0) + { + long int i = longval (); + if (i != (ENOLINK)) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != (ENOLINK)) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_header_errno_h_ENOLINK=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val + fi + fi + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_header_errno_h_ENOLINK" >&5 +echo "${ECHO_T}$gl_cv_header_errno_h_ENOLINK" >&6; } + case $gl_cv_header_errno_h_ENOLINK in + yes | no) + ENOLINK_HIDDEN=0; ENOLINK_VALUE= + ;; + *) + ENOLINK_HIDDEN=1; ENOLINK_VALUE="$gl_cv_header_errno_h_ENOLINK" + ;; + esac + + + fi + + + if test -n "$ERRNO_H"; then + { echo "$as_me:$LINENO: checking for EOVERFLOW value" >&5 +echo $ECHO_N "checking for EOVERFLOW value... $ECHO_C" >&6; } +if test "${gl_cv_header_errno_h_EOVERFLOW+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#ifdef EOVERFLOW +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + gl_cv_header_errno_h_EOVERFLOW=yes +else + gl_cv_header_errno_h_EOVERFLOW=no +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_EOVERFLOW = no; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +#ifdef EOVERFLOW +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then + gl_cv_header_errno_h_EOVERFLOW=hidden +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_EOVERFLOW = hidden; then + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((EOVERFLOW) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((EOVERFLOW) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else - # strerror_r is not declared. Choose between - # systems that have relatively inaccessible declarations for the - # function. BeOS and DEC UNIX 4.0 fall in this category, but the - # former has a strerror_r that returns char*, while the latter - # has a strerror_r that returns `int'. - # This test should segfault on the DEC system. - if test "$cross_compiling" = yes; then - : + done else - cat >conftest.$ac_ext <<_ACEOF + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default - extern char *strerror_r (); + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + int main () { -char buf[100]; - char x = *strerror_r (0, buf, sizeof buf); - return ! isalpha (x); +static int test_array [1 - 2 * !((EOVERFLOW) < 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include + +int +main () +{ +static int test_array [1 - 2 * !((EOVERFLOW) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_strerror_r_char_p=yes + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi - + ac_lo= ac_hi= fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5 -echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6; } -if test $ac_cv_func_strerror_r_char_p = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STRERROR_R_CHAR_P 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include +int +main () +{ +static int test_array [1 - 2 * !((EOVERFLOW) <= $ac_mid)]; +test_array [0] = 0 - - { echo "$as_me:$LINENO: checking whether the preprocessor supports include_next" >&5 -echo $ECHO_N "checking whether the preprocessor supports include_next... $ECHO_C" >&6; } -if test "${gl_cv_have_include_next+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -rf conftestd1 conftestd2 - mkdir conftestd1 conftestd2 - cat < conftestd1/conftest.h -#define DEFINED_IN_CONFTESTD1 -#include_next -#ifdef DEFINED_IN_CONFTESTD2 -int foo; -#else -#error "include_next doesn't work" -#endif -EOF - cat < conftestd2/conftest.h -#ifndef DEFINED_IN_CONFTESTD1 -#error "include_next test doesn't work" -#endif -#define DEFINED_IN_CONFTESTD2 -EOF - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2" - cat >conftest.$ac_ext <<_ACEOF -#include + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -10651,46 +11736,117 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - gl_cv_have_include_next=yes + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gl_cv_have_include_next=no + ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$save_CPPFLAGS" - rm -rf conftestd1 conftestd2 - -fi -{ echo "$as_me:$LINENO: result: $gl_cv_have_include_next" >&5 -echo "${ECHO_T}$gl_cv_have_include_next" >&6; } - if test $gl_cv_have_include_next = yes; then - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_INCLUDE_NEXT 1 +done +case $ac_lo in +?*) gl_cv_header_errno_h_EOVERFLOW=$ac_lo;; +'') ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include - INCLUDE_NEXT=include_next - else - INCLUDE_NEXT=include - fi +static long int longval () { return EOVERFLOW; } +static unsigned long int ulongval () { return EOVERFLOW; } +#include +#include +int +main () +{ + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if ((EOVERFLOW) < 0) + { + long int i = longval (); + if (i != (EOVERFLOW)) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != (EOVERFLOW)) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_header_errno_h_EOVERFLOW=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.val + fi + fi +fi +{ echo "$as_me:$LINENO: result: $gl_cv_header_errno_h_EOVERFLOW" >&5 +echo "${ECHO_T}$gl_cv_header_errno_h_EOVERFLOW" >&6; } + case $gl_cv_header_errno_h_EOVERFLOW in + yes | no) + EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE= + ;; + *) + EOVERFLOW_HIDDEN=1; EOVERFLOW_VALUE="$gl_cv_header_errno_h_EOVERFLOW" + ;; + esac - GNULIB_OPEN=0; - REPLACE_OPEN=0; + fi -{ echo "$as_me:$LINENO: checking for mbstate_t" >&5 -echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; } -if test "${ac_cv_type_mbstate_t+set}" = set; then +{ echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5 +echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_strerror_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10700,11 +11856,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -# include int main () { -mbstate_t x; return sizeof x; +#ifndef strerror_r + (void) strerror_r; +#endif + ; return 0; } @@ -10726,63 +11884,276 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_mbstate_t=yes + ac_cv_have_decl_strerror_r=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_mbstate_t=no + ac_cv_have_decl_strerror_r=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 -echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; } - if test $ac_cv_type_mbstate_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6; } +if test $ac_cv_have_decl_strerror_r = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MBSTATE_T 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR_R 1 _ACEOF - else -cat >>confdefs.h <<\_ACEOF -#define mbstate_t int +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR_R 0 _ACEOF - fi +fi + + + +for ac_func in strerror_r +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done +{ echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5 +echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6; } +if test "${ac_cv_func_strerror_r_char_p+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_func_strerror_r_char_p=no + if test $ac_cv_have_decl_strerror_r = yes; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + char *p = strerror_r (0, buf, sizeof buf); + return !p || x; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_func_strerror_r_char_p=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else + # strerror_r is not declared. Choose between + # systems that have relatively inaccessible declarations for the + # function. BeOS and DEC UNIX 4.0 fall in this category, but the + # former has a strerror_r that returns char*, while the latter + # has a strerror_r that returns `int'. + # This test should segfault on the DEC system. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + extern char *strerror_r (); +int +main () +{ +char buf[100]; + char x = *strerror_r (0, buf, sizeof buf); + return ! isalpha (x); + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_strerror_r_char_p=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5 +echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6; } +if test $ac_cv_func_strerror_r_char_p = yes; then +cat >>confdefs.h <<\_ACEOF +#define STRERROR_R_CHAR_P 1 +_ACEOF +fi + GNULIB_OPEN=0; + REPLACE_OPEN=0; + GNULIB_FPRINTF=0; GNULIB_FPRINTF_POSIX=0; + GNULIB_PRINTF=0; GNULIB_PRINTF_POSIX=0; GNULIB_SNPRINTF=0; GNULIB_SPRINTF_POSIX=0; + GNULIB_VFPRINTF=0; GNULIB_VFPRINTF_POSIX=0; + GNULIB_VPRINTF=0; GNULIB_VPRINTF_POSIX=0; GNULIB_VSNPRINTF=0; GNULIB_VSPRINTF_POSIX=0; GNULIB_VASPRINTF=0; + GNULIB_OBSTACK_PRINTF=0; + GNULIB_OBSTACK_PRINTF_POSIX=0; GNULIB_FOPEN=0; GNULIB_FREOPEN=0; GNULIB_FSEEK=0; @@ -10790,9 +12161,19 @@ _ACEOF GNULIB_FTELL=0; GNULIB_FTELLO=0; GNULIB_FFLUSH=0; + GNULIB_FCLOSE=0; + GNULIB_FPUTC=0; + GNULIB_PUTC=0; + GNULIB_PUTCHAR=0; + GNULIB_FPUTS=0; + GNULIB_PUTS=0; + GNULIB_FWRITE=0; GNULIB_GETDELIM=0; GNULIB_GETLINE=0; - REPLACE_FPRINTF=0; + GNULIB_PERROR=0; + GNULIB_STDIO_H_SIGPIPE=0; + REPLACE_STDIO_WRITE_FUNCS=0; + REPLACE_FPRINTF=0; REPLACE_VFPRINTF=0; REPLACE_PRINTF=0; REPLACE_VPRINTF=0; @@ -10804,6 +12185,8 @@ _ACEOF REPLACE_VSPRINTF=0; HAVE_VASPRINTF=1; REPLACE_VASPRINTF=0; + HAVE_DECL_OBSTACK_PRINTF=1; + REPLACE_OBSTACK_PRINTF=0; REPLACE_FOPEN=0; REPLACE_FREOPEN=0; HAVE_FSEEKO=1; @@ -10813,9 +12196,98 @@ _ACEOF REPLACE_FTELLO=0; REPLACE_FTELL=0; REPLACE_FFLUSH=0; + REPLACE_FCLOSE=0; HAVE_DECL_GETDELIM=1; HAVE_DECL_GETLINE=1; REPLACE_GETLINE=0; + REPLACE_PERROR=0; + + + +{ echo "$as_me:$LINENO: checking for mbstate_t" >&5 +echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; } +if test "${ac_cv_type_mbstate_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +# include +int +main () +{ +mbstate_t x; return sizeof x; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_mbstate_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_mbstate_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 +echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; } + if test $ac_cv_type_mbstate_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MBSTATE_T 1 +_ACEOF + + else + +cat >>confdefs.h <<\_ACEOF +#define mbstate_t int +_ACEOF + + fi + + + + + + + + + + + + + + + + + + + + + { echo "$as_me:$LINENO: checking whether stdin defaults to large file offsets" >&5 @@ -11037,7 +12509,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -struct s { int i, j; }; struct s s = (struct s) { 1, 2 }; +struct s { int i, j; }; int main () { @@ -13848,6 +15320,13 @@ echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; } + GNULIB_LCHMOD=0; + GNULIB_LSTAT=0; + HAVE_LCHMOD=1; + REPLACE_LSTAT=0; + REPLACE_MKDIR=0; + + { echo "$as_me:$LINENO: checking whether malloc, realloc, calloc are POSIX compliant" >&5 echo $ECHO_N "checking whether malloc, realloc, calloc are POSIX compliant... $ECHO_C" >&6; } if test "${gl_cv_func_malloc_posix+set}" = set; then @@ -13907,21 +15386,35 @@ echo "${ECHO_T}$gl_cv_func_malloc_posix" >&6; } GNULIB_MALLOC_POSIX=0; GNULIB_REALLOC_POSIX=0; GNULIB_CALLOC_POSIX=0; + GNULIB_ATOLL=0; + GNULIB_GETLOADAVG=0; GNULIB_GETSUBOPT=0; GNULIB_MKDTEMP=0; GNULIB_MKSTEMP=0; GNULIB_PUTENV=0; + GNULIB_RANDOM_R=0; + GNULIB_RPMATCH=0; GNULIB_SETENV=0; GNULIB_STRTOD=0; + GNULIB_STRTOLL=0; + GNULIB_STRTOULL=0; GNULIB_UNSETENV=0; - HAVE_CALLOC_POSIX=1; + HAVE_ATOLL=1; + HAVE_CALLOC_POSIX=1; HAVE_GETSUBOPT=1; HAVE_MALLOC_POSIX=1; HAVE_MKDTEMP=1; HAVE_REALLOC_POSIX=1; + HAVE_RANDOM_R=1; + HAVE_RPMATCH=1; HAVE_SETENV=1; HAVE_STRTOD=1; + HAVE_STRTOLL=1; + HAVE_STRTOULL=1; + HAVE_STRUCT_RANDOM_DATA=1; + HAVE_SYS_LOADAVG_H=0; HAVE_UNSETENV=1; + HAVE_DECL_GETLOADAVG=1; REPLACE_MKSTEMP=0; REPLACE_PUTENV=0; REPLACE_STRTOD=0; @@ -14218,6 +15711,7 @@ _ACEOF GNULIB_MEMMEM=0; GNULIB_MEMPCPY=0; GNULIB_MEMRCHR=0; + GNULIB_RAWMEMCHR=0; GNULIB_STPCPY=0; GNULIB_STPNCPY=0; GNULIB_STRCHRNUL=0; @@ -14245,9 +15739,11 @@ _ACEOF GNULIB_MBSTOK_R=0; GNULIB_STRERROR=0; GNULIB_STRSIGNAL=0; + GNULIB_STRVERSCMP=0; HAVE_DECL_MEMMEM=1; HAVE_MEMPCPY=1; HAVE_DECL_MEMRCHR=1; + HAVE_RAWMEMCHR=1; HAVE_STPCPY=1; HAVE_STPNCPY=1; HAVE_STRCHRNUL=1; @@ -14261,11 +15757,13 @@ _ACEOF HAVE_DECL_STRTOK_R=1; HAVE_DECL_STRERROR=1; HAVE_DECL_STRSIGNAL=1; - REPLACE_STRERROR=0; - REPLACE_STRSIGNAL=0; + HAVE_STRVERSCMP=1; REPLACE_MEMMEM=0; - REPLACE_STRCASESTR=0; + REPLACE_STRDUP=0; REPLACE_STRSTR=0; + REPLACE_STRCASESTR=0; + REPLACE_STRERROR=0; + REPLACE_STRSIGNAL=0; { echo "$as_me:$LINENO: checking whether memrchr is declared" >&5 echo $ECHO_N "checking whether memrchr is declared... $ECHO_C" >&6; } @@ -14351,8 +15849,6 @@ fi - - { echo "$as_me:$LINENO: checking whether snprintf is declared" >&5 echo $ECHO_N "checking whether snprintf is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_snprintf+set}" = set; then @@ -14501,13 +15997,17 @@ fi - { echo "$as_me:$LINENO: checking for working strerror function" >&5 + + + + if test -z "$ERRNO_H"; then + { echo "$as_me:$LINENO: checking for working strerror function" >&5 echo $ECHO_N "checking for working strerror function... $ECHO_C" >&6; } if test "${gl_cv_func_working_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14549,6 +16049,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -14599,11 +16100,17 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$a fi + fi { echo "$as_me:$LINENO: result: $gl_cv_func_working_strerror" >&5 echo "${ECHO_T}$gl_cv_func_working_strerror" >&6; } - if test $gl_cv_func_working_strerror = no ; then - REPLACE_STRERROR=1 + if test $gl_cv_func_working_strerror = no; then + REPLACE_STRERROR=1 + fi + else + REPLACE_STRERROR=1 + fi + if test $REPLACE_STRERROR = 1; then { echo "$as_me:$LINENO: checking whether strerror is declared" >&5 echo $ECHO_N "checking whether strerror is declared... $ECHO_C" >&6; } @@ -14674,6 +16181,159 @@ fi + + + + + + if test $ac_cv_header_sys_socket_h != yes; then + +for ac_header in winsock2.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------ ## +## Report this to bug-tar@gnu.org ## +## ------------------------------ ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + fi + fi @@ -15388,6 +17048,10 @@ _ACEOF + + + + { echo "$as_me:$LINENO: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; } if test "${gt_cv_c_wchar_t+set}" = set; then @@ -15782,8 +17446,7 @@ fi GNULIB_WCWIDTH=0; HAVE_DECL_WCWIDTH=1; REPLACE_WCWIDTH=0; - WCHAR_H= - + WCHAR_H=''; @@ -16577,516 +18240,109 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - fits_in_uint=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -fits_in_uint= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val - if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then - if test $fits_in_uint = 1; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - extern size_t foo; - extern unsigned long foo; - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - fits_in_uint=0 -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $fits_in_uint = 1; then - gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" - else - gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" - fi - else - gl_cv_size_max='((size_t)~(size_t)0)' - fi - fi - -fi - - { echo "$as_me:$LINENO: result: $gl_cv_size_max" >&5 -echo "${ECHO_T}$gl_cv_size_max" >&6; } - if test "$gl_cv_size_max" != yes; then - -cat >>confdefs.h <<_ACEOF -#define SIZE_MAX $gl_cv_size_max -_ACEOF - - fi - - - if false; then - GL_COND_LIBTOOL_TRUE= - GL_COND_LIBTOOL_FALSE='#' -else - GL_COND_LIBTOOL_TRUE='#' - GL_COND_LIBTOOL_FALSE= -fi - - gl_cond_libtool=false - gl_libdeps= - gl_ltlibdeps= - - - - gl_source_base='.#bootmp/lib' - - - { echo "$as_me:$LINENO: checking for EOVERFLOW" >&5 -echo $ECHO_N "checking for EOVERFLOW... $ECHO_C" >&6; } -if test "${ac_cv_decl_EOVERFLOW+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#ifdef EOVERFLOW -yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - have_eoverflow=1 -fi -rm -f conftest* - - if test -n "$have_eoverflow"; then - ac_cv_decl_EOVERFLOW=yes - else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#include -#ifdef EOVERFLOW -yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then - have_eoverflow=1 -fi -rm -f conftest* - - if test -n "$have_eoverflow"; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#include -/* The following two lines are a workaround against an autoconf-2.52 bug. */ -#include -#include - -int -main () -{ -static int test_array [1 - 2 * !((EOVERFLOW) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#include -/* The following two lines are a workaround against an autoconf-2.52 bug. */ -#include -#include - -int -main () -{ -static int test_array [1 - 2 * !((EOVERFLOW) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#include -/* The following two lines are a workaround against an autoconf-2.52 bug. */ -#include -#include - -int -main () -{ -static int test_array [1 - 2 * !((EOVERFLOW) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#include -/* The following two lines are a workaround against an autoconf-2.52 bug. */ -#include -#include - -int -main () -{ -static int test_array [1 - 2 * !((EOVERFLOW) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#include -/* The following two lines are a workaround against an autoconf-2.52 bug. */ -#include -#include - -int -main () -{ -static int test_array [1 - 2 * !((EOVERFLOW) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr '(' $ac_mid ')' + 1` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_decl_EOVERFLOW=$ac_lo;; -'') ;; -esac -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#define _XOPEN_SOURCE_EXTENDED 1 -#include -/* The following two lines are a workaround against an autoconf-2.52 bug. */ -#include -#include - -static long int longval () { return EOVERFLOW; } -static unsigned long int ulongval () { return EOVERFLOW; } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if ((EOVERFLOW) < 0) - { - long int i = longval (); - if (i != (EOVERFLOW)) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != (EOVERFLOW)) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_decl_EOVERFLOW=`cat conftest.val` + fits_in_uint=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +fits_in_uint= fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val + if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then + if test $fits_in_uint = 1; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + extern size_t foo; + extern unsigned long foo; + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + fits_in_uint=0 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $fits_in_uint = 1; then + gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)" + else + gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)" + fi else - ac_cv_decl_EOVERFLOW=E2BIG + gl_cv_size_max='((size_t)~(size_t)0)' fi fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_decl_EOVERFLOW" >&5 -echo "${ECHO_T}$ac_cv_decl_EOVERFLOW" >&6; } - if test "$ac_cv_decl_EOVERFLOW" != yes; then + + { echo "$as_me:$LINENO: result: $gl_cv_size_max" >&5 +echo "${ECHO_T}$gl_cv_size_max" >&6; } + if test "$gl_cv_size_max" != yes; then cat >>confdefs.h <<_ACEOF -#define EOVERFLOW $ac_cv_decl_EOVERFLOW +#define SIZE_MAX $gl_cv_size_max _ACEOF - EOVERFLOW="$ac_cv_decl_EOVERFLOW" - fi + if false; then + GL_COND_LIBTOOL_TRUE= + GL_COND_LIBTOOL_FALSE='#' +else + GL_COND_LIBTOOL_TRUE='#' + GL_COND_LIBTOOL_FALSE= +fi + + gl_cond_libtool=false + gl_libdeps= + gl_ltlibdeps= + + + + + + + + + gl_source_base='.#bootmp/lib' + @@ -17150,6 +18406,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS argmatch.$ac_objext" @@ -17165,6 +18422,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" @@ -17174,6 +18432,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" @@ -17523,6 +18782,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + gl_LIBOBJS="$gl_LIBOBJS backupfile.$ac_objext" @@ -17555,6 +18815,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + gl_LIBOBJS="$gl_LIBOBJS canonicalize-lgpl.$ac_objext" @@ -17583,6 +18844,13 @@ _ACEOF fi + +cat >>confdefs.h <<\_ACEOF +#define GNULIB_CANONICALIZE_LGPL 1 +_ACEOF + + + { echo "$as_me:$LINENO: checking whether this system has an arbitrary file name length limit" >&5 echo $ECHO_N "checking whether this system has an arbitrary file name length limit... $ECHO_C" >&6; } if test "${gl_cv_have_arbitrary_file_name_length_limit+set}" = set; then @@ -17620,6 +18888,7 @@ echo "${ECHO_T}$gl_cv_have_arbitrary_file_name_length_limit" >&6; } + gl_LIBOBJS="$gl_LIBOBJS chdir-long.$ac_objext" @@ -17653,6 +18922,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS chown.$ac_objext" @@ -17747,6 +19017,7 @@ else + gl_LIBOBJS="$gl_LIBOBJS fchown-stub.$ac_objext" fi @@ -17955,6 +19226,14 @@ done + GNULIB_CLOSE=1 + + + + + + + @@ -17978,6 +19257,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS closeout.$ac_objext" @@ -18066,6 +19346,67 @@ _ACEOF + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_dirent_h='<'dirent.h'>' + else + { echo "$as_me:$LINENO: checking absolute name of " >&5 +echo $ECHO_N "checking absolute name of ... $ECHO_C" >&6; } +if test "${gl_cv_next_dirent_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test $ac_cv_header_dirent_h = yes; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF + gl_cv_next_dirent_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/dirent.h#{ + s#.*"\(.*/dirent.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_dirent_h='<'dirent.h'>' + fi + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_next_dirent_h" >&5 +echo "${ECHO_T}$gl_cv_next_dirent_h" >&6; } + fi + NEXT_DIRENT_H=$gl_cv_next_dirent_h + + + + + + + + + DIRENT_H='dirent.h' + + + + + + + + for ac_func in dirfd do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -18229,6 +19570,9 @@ _ACEOF fi + if test $ac_cv_have_decl_dirfd = no; then + HAVE_DECL_DIRFD=0 + fi { echo "$as_me:$LINENO: checking whether dirfd is a macro" >&5 echo $ECHO_N "checking whether dirfd is a macro... $ECHO_C" >&6; } @@ -18272,6 +19616,7 @@ echo "${ECHO_T}$gl_cv_func_dirfd_macro" >&6; } + for ac_func in dirfd do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -18447,6 +19792,11 @@ _ACEOF + GNULIB_DIRFD=1 + + + + @@ -18462,6 +19812,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS dirname.$ac_objext" @@ -18471,6 +19822,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS stripslash.$ac_objext" @@ -18536,6 +19888,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext" fi @@ -18629,6 +19982,11 @@ _ACEOF + + + + + { echo "$as_me:$LINENO: checking for error_at_line" >&5 echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6; } if test "${ac_cv_lib_error_at_line+set}" = set; then @@ -18688,6 +20046,7 @@ if test $ac_cv_lib_error_at_line = no; then + gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext" fi @@ -18713,6 +20072,7 @@ fi + gl_LIBOBJS="$gl_LIBOBJS exclude.$ac_objext" @@ -18724,6 +20084,7 @@ fi + gl_LIBOBJS="$gl_LIBOBJS exitfail.$ac_objext" @@ -18737,6 +20098,7 @@ fi + if test $ac_cv_func_fchdir = no; then REPLACE_FCHDIR=1 @@ -18746,6 +20108,7 @@ fi + gl_LIBOBJS="$gl_LIBOBJS fchdir.$ac_objext" : @@ -18756,6 +20119,7 @@ _ACEOF + if test $REPLACE_OPEN != 1; then @@ -18764,49 +20128,52 @@ _ACEOF - if test $gl_cv_have_include_next = yes; then - gl_cv_next_dirent_h='<'dirent.h'>' - else - { echo "$as_me:$LINENO: checking absolute name of " >&5 -echo $ECHO_N "checking absolute name of ... $ECHO_C" >&6; } -if test "${gl_cv_next_dirent_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + gl_LIBOBJS="$gl_LIBOBJS open.$ac_objext" - if test $ac_cv_header_dirent_h = yes; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF - gl_cv_next_dirent_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/dirent.h#{ - s#.*"\(.*/dirent.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_dirent_h='<'dirent.h'>' - fi -fi -{ echo "$as_me:$LINENO: result: $gl_cv_next_dirent_h" >&5 -echo "${ECHO_T}$gl_cv_next_dirent_h" >&6; } - fi - NEXT_DIRENT_H=$gl_cv_next_dirent_h + : + + fi + REPLACE_OPEN=1 - DIRENT_H='dirent.h' - else - DIRENT_H= + if test $REPLACE_CLOSE != 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS close.$ac_objext" + fi + REPLACE_CLOSE=1 + + if test $REPLACE_FCLOSE != 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS fclose.$ac_objext" + + fi + REPLACE_FCLOSE=1 + + + + + DIRENT_H='dirent.h' + + fi @@ -18814,6 +20181,12 @@ echo "${ECHO_T}$gl_cv_next_dirent_h" >&6; } + + + GNULIB_FCLOSE=1 + + + { echo "$as_me:$LINENO: checking for working fcntl.h" >&5 echo $ECHO_N "checking for working fcntl.h... $ECHO_C" >&6; } if test "${gl_cv_header_working_fcntl_h+set}" = set; then @@ -18995,6 +20368,7 @@ echo "${ECHO_T}$gl_cv_next_fcntl_h" >&6; } + gl_LIBOBJS="$gl_LIBOBJS open-safer.$ac_objext" @@ -19004,6 +20378,7 @@ echo "${ECHO_T}$gl_cv_next_fcntl_h" >&6; } + gl_LIBOBJS="$gl_LIBOBJS creat-safer.$ac_objext" @@ -19127,6 +20502,7 @@ else + gl_LIBOBJS="$gl_LIBOBJS fileblocks.$ac_objext" fi @@ -19412,6 +20788,7 @@ fi + gl_LIBOBJS="$gl_LIBOBJS fnmatch.$ac_objext" @@ -19548,6 +20925,9 @@ else '# old glibc iostream?' \ 'fp->_pptr - fp->_pbase' \ \ + '# emx+gcc' \ + 'fp->_ptr - fp->_buffer' \ + \ '# VMS' \ '(*fp)->_ptr - (*fp)->_base' \ \ @@ -19622,6 +21002,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS fpending.$ac_objext" fi @@ -19696,6 +21077,7 @@ echo "${ECHO_T}$gl_cv_func_fseeko" >&6; } + gl_LIBOBJS="$gl_LIBOBJS fseeko.$ac_objext" @@ -19710,6 +21092,7 @@ echo "${ECHO_T}$gl_cv_func_fseeko" >&6; } + gl_LIBOBJS="$gl_LIBOBJS fseeko.$ac_objext" @@ -19739,6 +21122,7 @@ echo "${ECHO_T}$gl_cv_func_fseeko" >&6; } + gl_LIBOBJS="$gl_LIBOBJS ftruncate.$ac_objext" @@ -20342,6 +21726,7 @@ fi + gl_LIBOBJS="$gl_LIBOBJS getcwd.$ac_objext" @@ -20625,6 +22010,7 @@ fi + for ac_func in getdelim do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -20825,6 +22211,74 @@ _ACEOF fi done + { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5 +echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef getc_unlocked + (void) getc_unlocked; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_getc_unlocked=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_getc_unlocked=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5 +echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; } +if test $ac_cv_have_decl_getc_unlocked = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED 0 +_ACEOF + + +fi + + fi @@ -21041,6 +22495,7 @@ echo "${ECHO_T}$am_cv_func_working_getline" >&6; } + gl_LIBOBJS="$gl_LIBOBJS getline.$ac_objext" @@ -21058,6 +22513,7 @@ echo "${ECHO_T}$am_cv_func_working_getline" >&6; } + for ac_func in getdelim do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -21258,6 +22714,74 @@ _ACEOF fi done + { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5 +echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef getc_unlocked + (void) getc_unlocked; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_getc_unlocked=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_getc_unlocked=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5 +echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; } +if test $ac_cv_have_decl_getc_unlocked = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETC_UNLOCKED 0 +_ACEOF + + +fi + + fi @@ -21283,6 +22807,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" @@ -21292,6 +22817,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" @@ -21719,6 +23245,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS getpagesize.$ac_objext" ;; @@ -21739,6 +23266,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS gettime.$ac_objext" @@ -21906,6 +23434,7 @@ echo "${ECHO_T}$gl_cv_func_gettimeofday_clobber" >&6; } + gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext" @@ -22179,6 +23708,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext" @@ -22433,6 +23963,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS hash.$ac_objext" @@ -22446,6 +23977,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS human.$ac_objext" @@ -22525,6 +24057,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS imaxtostr.$ac_objext" @@ -22534,6 +24067,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS offtostr.$ac_objext" @@ -22543,6 +24077,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS umaxtostr.$ac_objext" @@ -22552,6 +24087,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS uinttostr.$ac_objext" @@ -23203,6 +24739,7 @@ echo "${ECHO_T}$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; } + for ac_func in lchown do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -23422,6 +24959,7 @@ echo "${ECHO_T}$gl_cv_func_lseek_pipe" >&6; } + gl_LIBOBJS="$gl_LIBOBJS lseek.$ac_objext" @@ -23439,6 +24977,7 @@ _ACEOF GNULIB_LSEEK=1 + { echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then @@ -23528,11 +25067,21 @@ if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then + gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" fi - : + if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then + REPLACE_LSTAT=1 + fi + # Prerequisites of lib/lstat.c. + + : + + + + GNULIB_LSTAT=1 for ac_header in stdlib.h @@ -23761,6 +25310,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext" @@ -23794,6 +25344,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS malloc.$ac_objext" HAVE_MALLOC_POSIX=0 @@ -23835,6 +25386,7 @@ _ACEOF + for ac_func in memchr do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -24097,6 +25649,7 @@ done + for ac_func in mempcpy do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -24226,6 +25779,7 @@ done + for ac_func in memrchr do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -24341,6 +25895,7 @@ done + for ac_func in memset do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -24455,6 +26010,7 @@ done + for ac_func in mkdtemp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -24819,6 +26375,7 @@ if test $ac_cv_func_working_mktime = no; then + gl_LIBOBJS="$gl_LIBOBJS mktime.$ac_objext" fi @@ -24842,6 +26399,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS modechange.$ac_objext" @@ -24855,6 +26413,8 @@ _ACEOF + + { echo "$as_me:$LINENO: checking for obstacks" >&5 echo $ECHO_N "checking for obstacks... $ECHO_C" >&6; } if test "${ac_cv_func_obstack+set}" = set; then @@ -24925,12 +26485,152 @@ else + gl_LIBOBJS="$gl_LIBOBJS obstack.$ac_objext" fi + case "$host_os" in + mingw* | pw*) + + + if test $REPLACE_OPEN != 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS open.$ac_objext" + + + + : + + fi + REPLACE_OPEN=1 + + ;; + *) + { echo "$as_me:$LINENO: checking whether open recognizes a trailing slash" >&5 +echo $ECHO_N "checking whether open recognizes a trailing slash... $ECHO_C" >&6; } +if test "${gl_cv_func_open_slash+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + + case "$host_os" in + solaris2.[0-9]*) gl_cv_func_open_slash="guessing no" ;; + hpux*) gl_cv_func_open_slash="guessing no" ;; + *) gl_cv_func_open_slash="guessing yes" ;; + esac + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#if HAVE_UNISTD_H +# include +#endif +int main () +{ + return open ("conftest.sl/", O_CREAT, 0600) >= 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_open_slash=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_open_slash=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + rm -f conftest.sl + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_open_slash" >&5 +echo "${ECHO_T}$gl_cv_func_open_slash" >&6; } + case "$gl_cv_func_open_slash" in + *no) + +cat >>confdefs.h <<\_ACEOF +#define OPEN_TRAILING_SLASH_BUG 1 +_ACEOF + + + + if test $REPLACE_OPEN != 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS open.$ac_objext" + + + + : + + fi + REPLACE_OPEN=1 + + ;; + esac + ;; + esac + + + +cat >>confdefs.h <<\_ACEOF +#define GNULIB_OPEN 1 +_ACEOF + + + + + GNULIB_OPEN=1 + + + + @@ -24970,6 +26670,9 @@ fi + + + @@ -25072,6 +26775,7 @@ fi done + case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in yes+yes) ;; yes+*) @@ -25081,6 +26785,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS fstatat.$ac_objext" ;; *) @@ -25277,6 +26982,7 @@ fi + gl_LIBOBJS="$gl_LIBOBJS fchownat.$ac_objext" @@ -25303,6 +27009,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS quote.$ac_objext" @@ -25315,6 +27022,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS quotearg.$ac_objext" @@ -25460,6 +27168,126 @@ _ACEOF + + + + + +for ac_func in rawmemchr +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* 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 $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +else + + gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext" + +fi +done + + + if test $ac_cv_func_rawmemchr = no; then + HAVE_RAWMEMCHR=0 + : + fi + + + + GNULIB_RAWMEMCHR=1 + + + + + + + + + if test $ac_cv_func_readlink = no; then HAVE_READLINK=0 @@ -25469,6 +27297,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext" @@ -25497,6 +27326,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS realloc.$ac_objext" HAVE_REALLOC_POSIX=0 @@ -25810,6 +27640,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS regex.$ac_objext" @@ -25817,6 +27648,151 @@ _ACEOF +for ac_header in libintl.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ------------------------------ ## +## Report this to bug-tar@gnu.org ## +## ------------------------------ ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + @@ -25911,6 +27887,7 @@ fi + for ac_func in rmdir do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -26019,6 +27996,10 @@ done + + + + for ac_func in rpmatch do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -26118,9 +28099,75 @@ done if test $ac_cv_func_rpmatch = no; then - : + HAVE_RPMATCH=0 + + { echo "$as_me:$LINENO: checking for nl_langinfo and YESEXPR" >&5 +echo $ECHO_N "checking for nl_langinfo and YESEXPR... $ECHO_C" >&6; } +if test "${gl_cv_langinfo_yesexpr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +char* cs = nl_langinfo(YESEXPR); return !cs; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + gl_cv_langinfo_yesexpr=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_langinfo_yesexpr=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_langinfo_yesexpr" >&5 +echo "${ECHO_T}$gl_cv_langinfo_yesexpr" >&6; } + if test $gl_cv_langinfo_yesexpr = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LANGINFO_YESEXPR 1 +_ACEOF + fi + fi + + + + GNULIB_RPMATCH=1 + + @@ -26144,6 +28191,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS safe-write.$ac_objext" @@ -26161,6 +28209,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS save-cwd.$ac_objext" @@ -26178,6 +28227,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS savedir.$ac_objext" @@ -26198,6 +28248,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext" @@ -26457,13 +28508,76 @@ done + { echo "$as_me:$LINENO: checking whether sleep is declared" >&5 +echo $ECHO_N "checking whether sleep is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_sleep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +#ifndef sleep + (void) sleep; +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_sleep=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_have_decl_sleep=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_sleep" >&5 +echo "${ECHO_T}$ac_cv_have_decl_sleep" >&6; } +if test $ac_cv_have_decl_sleep = yes; then +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SLEEP 1 +_ACEOF - if test $ac_cv_func_sleep = no; then + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SLEEP 0 +_ACEOF + + +fi + + + if test $ac_cv_have_decl_sleep != yes; then HAVE_SLEEP=0 @@ -26472,6 +28586,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS sleep.$ac_objext" : @@ -26483,6 +28598,7 @@ done + gl_cv_func_snprintf_usable=no for ac_func in snprintf do @@ -26577,7 +28693,79 @@ _ACEOF fi done - if test $ac_cv_func_snprintf = no; then + if test $ac_cv_func_snprintf = yes; then + + + { echo "$as_me:$LINENO: checking whether snprintf respects a size of 1" >&5 +echo $ECHO_N "checking whether snprintf respects a size of 1... $ECHO_C" >&6; } +if test "${gl_cv_func_snprintf_size1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + gl_cv_func_snprintf_size1="guessing yes" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +int main() +{ + static char buf[8] = "DEADBEEF"; + snprintf (buf, 1, "%d", 12345); + return buf[1] != 'E'; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_snprintf_size1=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_snprintf_size1=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_snprintf_size1" >&5 +echo "${ECHO_T}$gl_cv_func_snprintf_size1" >&6; } + + case "$gl_cv_func_snprintf_size1" in + *yes) + gl_cv_func_snprintf_usable=yes + ;; + esac + fi + if test $gl_cv_func_snprintf_usable = no; then + @@ -28830,6 +31018,17 @@ echo "${ECHO_T}$gl_cv_next_stdio_h" >&6; } + GNULIB_FPRINTF=1 + GNULIB_PRINTF=1 + GNULIB_VFPRINTF=1 + GNULIB_VPRINTF=1 + GNULIB_FPUTC=1 + GNULIB_PUTC=1 + GNULIB_PUTCHAR=1 + GNULIB_FPUTS=1 + GNULIB_PUTS=1 + GNULIB_FWRITE=1 + @@ -28881,6 +31080,72 @@ echo "${ECHO_T}$gl_cv_next_stdlib_h" >&6; } + { echo "$as_me:$LINENO: checking for struct random_data" >&5 +echo $ECHO_N "checking for struct random_data... $ECHO_C" >&6; } +if test "${ac_cv_type_struct_random_data+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +typedef struct random_data ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_struct_random_data=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_struct_random_data=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_struct_random_data" >&5 +echo "${ECHO_T}$ac_cv_type_struct_random_data" >&6; } +if test $ac_cv_type_struct_random_data = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_RANDOM_DATA 1 +_ACEOF + + +else + HAVE_STRUCT_RANDOM_DATA=0 +fi + + @@ -29016,6 +31281,7 @@ done + for ac_func in strcasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -29131,6 +31397,7 @@ done + for ac_func in strncasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -29319,6 +31586,7 @@ fi + for ac_func in strchrnul do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -29436,6 +31704,7 @@ done + for ac_func in strdup do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -29549,7 +31818,8 @@ done - if test $gl_cv_func_working_strerror = no; then + if test $REPLACE_STRERROR = 1; then + @@ -29710,7 +31980,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - #include + #include int main () { @@ -29778,6 +32048,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS strndup.$ac_objext" : @@ -29880,6 +32151,7 @@ test $ac_cv_func_strnlen_working = no && + gl_LIBOBJS="$gl_LIBOBJS strnlen.$ac_objext" @@ -29941,6 +32213,7 @@ echo "${ECHO_T}$gl_cv_func_strtoimax_macro" >&6; } + for ac_func in strtoimax do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -30127,6 +32400,7 @@ fi + for ac_func in strtol do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -30228,6 +32502,7 @@ done + if test "$ac_cv_type_long_long_int" = yes; then @@ -30237,6 +32512,7 @@ done + for ac_func in strtoll do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -30336,6 +32612,7 @@ done if test $ac_cv_func_strtoll = no; then + HAVE_STRTOLL=0 : @@ -30344,6 +32621,11 @@ done + GNULIB_STRTOLL=1 + + + + @@ -30452,6 +32734,7 @@ done + if test "$ac_cv_type_unsigned_long_long_int" = yes; then @@ -30461,6 +32744,7 @@ done + for ac_func in strtoull do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -30560,6 +32844,7 @@ done if test $ac_cv_func_strtoull = no; then + HAVE_STRTOULL=0 : @@ -30568,6 +32853,10 @@ done + GNULIB_STRTOULL=1 + + + { echo "$as_me:$LINENO: checking whether defines strtoumax as a macro" >&5 @@ -30607,6 +32896,7 @@ echo "${ECHO_T}$gl_cv_func_strtoumax_macro" >&6; } + for ac_func in strtoumax do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -30747,280 +33037,56 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl_strtoull=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_strtoull=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strtoull" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strtoull" >&6; } -if test $ac_cv_have_decl_strtoull = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOULL 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOULL 0 -_ACEOF - - -fi - - - - - fi - fi - - - - GNULIB_STRTOUMAX=1 - - - - - - - - - if test $ac_cv_func_lstat = yes; then - HAVE_LSTAT=1 - else - HAVE_LSTAT=0 - fi - - - { echo "$as_me:$LINENO: checking whether mkdir is declared" >&5 -echo $ECHO_N "checking whether mkdir is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_mkdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -int -main () -{ -#ifndef mkdir - (void) mkdir; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_mkdir=yes + ac_cv_have_decl_strtoull=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_mkdir=no + ac_cv_have_decl_strtoull=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_mkdir" >&5 -echo "${ECHO_T}$ac_cv_have_decl_mkdir" >&6; } -if test $ac_cv_have_decl_mkdir = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strtoull" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strtoull" >&6; } +if test $ac_cv_have_decl_strtoull = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MKDIR 1 +#define HAVE_DECL_STRTOULL 1 _ACEOF else cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MKDIR 0 +#define HAVE_DECL_STRTOULL 0 _ACEOF -for ac_header in io.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no -fi + fi + fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------ ## -## Report this to bug-tar@gnu.org ## -## ------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + GNULIB_STRTOUMAX=1 + + -fi -done -fi - if test $ac_cv_have_decl_mkdir = yes; then - HAVE_DECL_MKDIR=1 - else - HAVE_DECL_MKDIR=0 - fi - if test "$ac_cv_header_io_h" = yes; then - HAVE_IO_H=1 + + + if test $ac_cv_func_lstat = yes; then + HAVE_LSTAT=1 else - HAVE_IO_H=0 + HAVE_LSTAT=0 fi @@ -31037,6 +33103,7 @@ fi + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_stat_h='<'sys/stat.h'>' else @@ -31078,6 +33145,73 @@ echo "${ECHO_T}$gl_cv_next_sys_stat_h" >&6; } SYS_STAT_H='sys/stat.h' + { echo "$as_me:$LINENO: checking for nlink_t" >&5 +echo $ECHO_N "checking for nlink_t... $ECHO_C" >&6; } +if test "${ac_cv_type_nlink_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +typedef nlink_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_nlink_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_nlink_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_nlink_t" >&5 +echo "${ECHO_T}$ac_cv_type_nlink_t" >&6; } +if test $ac_cv_type_nlink_t = yes; then + : +else + +cat >>confdefs.h <<\_ACEOF +#define nlink_t int +_ACEOF + +fi + + + { echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } if test -z "$MKDIR_P"; then @@ -31300,6 +33434,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + gl_LIBOBJS="$gl_LIBOBJS tempname.$ac_objext" @@ -31381,6 +33516,7 @@ echo "${ECHO_T}$gl_cv_time_r_posix" >&6; } + gl_LIBOBJS="$gl_LIBOBJS time_r.$ac_objext" @@ -31470,6 +33606,7 @@ echo "${ECHO_T}$gl_cv_next_unistd_h" >&6; } + gl_LIBOBJS="$gl_LIBOBJS dup-safer.$ac_objext" @@ -31479,6 +33616,7 @@ echo "${ECHO_T}$gl_cv_next_unistd_h" >&6; } + gl_LIBOBJS="$gl_LIBOBJS fd-safer.$ac_objext" @@ -31488,6 +33626,7 @@ echo "${ECHO_T}$gl_cv_next_unistd_h" >&6; } + gl_LIBOBJS="$gl_LIBOBJS pipe-safer.$ac_objext" @@ -31507,6 +33646,7 @@ echo "${ECHO_T}$gl_cv_next_unistd_h" >&6; } + gl_LIBOBJS="$gl_LIBOBJS unlinkdir.$ac_objext" @@ -31696,6 +33836,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS unsetenv.$ac_objext" @@ -31786,6 +33927,7 @@ echo "${ECHO_T}$gt_cv_func_unsetenv_ret" >&6; } + gl_LIBOBJS="$gl_LIBOBJS utime.$ac_objext" @@ -31890,6 +34032,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS utimens.$ac_objext" @@ -31907,6 +34050,10 @@ _ACEOF + + + + @@ -31927,6 +34074,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS vasnprintf.$ac_objext" @@ -31936,6 +34084,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS printf-args.$ac_objext" @@ -31945,6 +34094,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS printf-parse.$ac_objext" @@ -31954,6 +34104,7 @@ _ACEOF + gl_LIBOBJS="$gl_LIBOBJS asnprintf.$ac_objext" if test $ac_cv_func_vasnprintf = yes; then @@ -32216,6 +34367,7 @@ fi + gl_cv_func_vsnprintf_usable=no for ac_func in vsnprintf do @@ -32310,7 +34462,79 @@ _ACEOF fi done - if test $ac_cv_func_vsnprintf = no; then + if test $ac_cv_func_vsnprintf = yes; then + + + { echo "$as_me:$LINENO: checking whether snprintf respects a size of 1" >&5 +echo $ECHO_N "checking whether snprintf respects a size of 1... $ECHO_C" >&6; } +if test "${gl_cv_func_snprintf_size1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + gl_cv_func_snprintf_size1="guessing yes" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +int main() +{ + static char buf[8] = "DEADBEEF"; + snprintf (buf, 1, "%d", 12345); + return buf[1] != 'E'; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_snprintf_size1=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_snprintf_size1=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_snprintf_size1" >&5 +echo "${ECHO_T}$gl_cv_func_snprintf_size1" >&6; } + + case "$gl_cv_func_snprintf_size1" in + *yes) + gl_cv_func_vsnprintf_usable=yes + ;; + esac + fi + if test $gl_cv_func_vsnprintf_usable = no; then + @@ -32380,7 +34604,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $gl_cv_header_wchar_h_standalone" >&5 echo "${ECHO_T}$gl_cv_header_wchar_h_standalone" >&6; } - if test $gl_cv_header_wchar_h_standalone != yes; then + + + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else + HAVE_WINT_T=0 + fi + + + if test $gl_cv_header_wchar_h_standalone != yes || test $gt_cv_c_wint_t != yes; then WCHAR_H=wchar.h fi @@ -32452,6 +34685,7 @@ echo "${ECHO_T}$gl_cv_next_wchar_h" >&6; } + if test $ac_cv_func_iswcntrl = yes; then HAVE_ISWCNTRL=1 else @@ -32477,7 +34711,112 @@ echo "${ECHO_T}$gl_cv_next_wchar_h" >&6; } WCTYPE_H=wctype.h if test $ac_cv_header_wctype_h = yes; then if test $ac_cv_func_iswcntrl = yes; then - WCTYPE_H= + { echo "$as_me:$LINENO: checking whether iswcntrl works" >&5 +echo $ECHO_N "checking whether iswcntrl works... $ECHO_C" >&6; } +if test "${gl_cv_func_iswcntrl_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #if __GNU_LIBRARY__ == 1 + Linux libc5 i18n is broken. + #endif +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gl_cv_func_iswcntrl_works=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_func_iswcntrl_works=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + #include + #include + #include + int main () { return iswprint ('x') == 0; } +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_func_iswcntrl_works=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +gl_cv_func_iswcntrl_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_iswcntrl_works" >&5 +echo "${ECHO_T}$gl_cv_func_iswcntrl_works" >&6; } + if test $gl_cv_func_iswcntrl_works = yes; then + WCTYPE_H= + fi fi @@ -32534,6 +34873,13 @@ echo "${ECHO_T}$gl_cv_next_wctype_h" >&6; } + if test "$gl_cv_func_iswcntrl_works" = no; then + REPLACE_ISWCNTRL=1 + else + REPLACE_ISWCNTRL=0 + fi + + @@ -32734,12 +35080,16 @@ echo "${ECHO_T}$gl_cv_func_wcwidth_works" >&6; } + gl_LIBOBJS="$gl_LIBOBJS wcwidth.$ac_objext" fi if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then - WCHAR_H=wchar.h + + + WCHAR_H=wchar.h + fi @@ -32752,6 +35102,15 @@ echo "${ECHO_T}$gl_cv_func_wcwidth_works" >&6; } + GNULIB_WRITE=1 + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS xmalloc.$ac_objext" @@ -32773,6 +35132,7 @@ echo "${ECHO_T}$gl_cv_func_wcwidth_works" >&6; } + gl_LIBOBJS="$gl_LIBOBJS xgetcwd.$ac_objext" @@ -32940,6 +35300,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS xstrtol.$ac_objext" @@ -32949,6 +35310,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS xstrtoul.$ac_objext" @@ -32958,6 +35320,7 @@ done + gl_LIBOBJS="$gl_LIBOBJS xstrtol-error.$ac_objext" @@ -32965,16 +35328,29 @@ done + + + + + gltests_libdeps= gltests_ltlibdeps= + + + + + gl_source_base='.#bootmp/tests' + + + LIBTAR_LIBDEPS="$gl_libdeps" LIBTAR_LTLIBDEPS="$gl_ltlibdeps" @@ -34792,23 +37168,68 @@ fi - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { echo "$as_me:$LINENO: checking for 64-bit host" >&5 +echo $ECHO_N "checking for 64-bit host... $ECHO_C" >&6; } +if test "${gl_cv_solaris_64bit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_solaris_64bit" >&5 +echo "${ECHO_T}$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" @@ -34857,6 +37278,10 @@ if test "${with_libiconv_prefix+set}" = set; then else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -35008,7 +37433,9 @@ fi if test "X$found_dir" != "X"; then LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -35078,6 +37505,11 @@ fi LIBICONV_PREFIX="$basedir" additional_includedir="$basedir/include" ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + LIBICONV_PREFIX="$basedir" + additional_includedir="$basedir/include" + ;; esac if test "X$additional_includedir" != "X"; then if test "X$additional_includedir" != "X/usr/include"; then @@ -35124,9 +37556,11 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -36709,6 +39143,10 @@ if test "${with_libintl_prefix+set}" = set; then else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -36860,7 +39298,9 @@ fi if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -36930,6 +39370,11 @@ fi LIBINTL_PREFIX="$basedir" additional_includedir="$basedir/include" ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + LIBINTL_PREFIX="$basedir" + additional_includedir="$basedir/include" + ;; esac if test "X$additional_includedir" != "X"; then if test "X$additional_includedir" != "X/usr/include"; then @@ -36976,9 +39421,11 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -37826,7 +40273,7 @@ exec 6>&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.20, which was +This file was extended by GNU tar $as_me 1.21, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -37879,7 +40326,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU tar config.status 1.20 +GNU tar config.status 1.21 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -38160,18 +40607,18 @@ STDBOOL_H!$STDBOOL_H$ac_delim HAVE__BOOL!$HAVE__BOOL$ac_delim GL_COND_LIBTOOL_TRUE!$GL_COND_LIBTOOL_TRUE$ac_delim GL_COND_LIBTOOL_FALSE!$GL_COND_LIBTOOL_FALSE$ac_delim -EOVERFLOW!$EOVERFLOW$ac_delim ALLOCA!$ALLOCA$ac_delim ALLOCA_H!$ALLOCA_H$ac_delim GETOPT_H!$GETOPT_H$ac_delim GNULIB_CHOWN!$GNULIB_CHOWN$ac_delim +GNULIB_CLOSE!$GNULIB_CLOSE$ac_delim GNULIB_DUP2!$GNULIB_DUP2$ac_delim GNULIB_ENVIRON!$GNULIB_ENVIRON$ac_delim +GNULIB_EUIDACCESS!$GNULIB_EUIDACCESS$ac_delim GNULIB_FCHDIR!$GNULIB_FCHDIR$ac_delim +GNULIB_FSYNC!$GNULIB_FSYNC$ac_delim GNULIB_FTRUNCATE!$GNULIB_FTRUNCATE$ac_delim GNULIB_GETCWD!$GNULIB_GETCWD$ac_delim -GNULIB_GETLOGIN_R!$GNULIB_GETLOGIN_R$ac_delim -GNULIB_GETPAGESIZE!$GNULIB_GETPAGESIZE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -38213,13 +40660,27 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +GNULIB_GETDOMAINNAME!$GNULIB_GETDOMAINNAME$ac_delim +GNULIB_GETDTABLESIZE!$GNULIB_GETDTABLESIZE$ac_delim +GNULIB_GETHOSTNAME!$GNULIB_GETHOSTNAME$ac_delim +GNULIB_GETLOGIN_R!$GNULIB_GETLOGIN_R$ac_delim +GNULIB_GETPAGESIZE!$GNULIB_GETPAGESIZE$ac_delim +GNULIB_GETUSERSHELL!$GNULIB_GETUSERSHELL$ac_delim GNULIB_LCHOWN!$GNULIB_LCHOWN$ac_delim GNULIB_LSEEK!$GNULIB_LSEEK$ac_delim GNULIB_READLINK!$GNULIB_READLINK$ac_delim GNULIB_SLEEP!$GNULIB_SLEEP$ac_delim +GNULIB_UNISTD_H_SIGPIPE!$GNULIB_UNISTD_H_SIGPIPE$ac_delim +GNULIB_WRITE!$GNULIB_WRITE$ac_delim HAVE_DUP2!$HAVE_DUP2$ac_delim +HAVE_EUIDACCESS!$HAVE_EUIDACCESS$ac_delim +HAVE_FSYNC!$HAVE_FSYNC$ac_delim HAVE_FTRUNCATE!$HAVE_FTRUNCATE$ac_delim +HAVE_GETDOMAINNAME!$HAVE_GETDOMAINNAME$ac_delim +HAVE_GETDTABLESIZE!$HAVE_GETDTABLESIZE$ac_delim +HAVE_GETHOSTNAME!$HAVE_GETHOSTNAME$ac_delim HAVE_GETPAGESIZE!$HAVE_GETPAGESIZE$ac_delim +HAVE_GETUSERSHELL!$HAVE_GETUSERSHELL$ac_delim HAVE_READLINK!$HAVE_READLINK$ac_delim HAVE_SLEEP!$HAVE_SLEEP$ac_delim HAVE_DECL_ENVIRON!$HAVE_DECL_ENVIRON$ac_delim @@ -38227,12 +40688,21 @@ HAVE_DECL_GETLOGIN_R!$HAVE_DECL_GETLOGIN_R$ac_delim HAVE_OS_H!$HAVE_OS_H$ac_delim HAVE_SYS_PARAM_H!$HAVE_SYS_PARAM_H$ac_delim REPLACE_CHOWN!$REPLACE_CHOWN$ac_delim +REPLACE_CLOSE!$REPLACE_CLOSE$ac_delim REPLACE_FCHDIR!$REPLACE_FCHDIR$ac_delim REPLACE_GETCWD!$REPLACE_GETCWD$ac_delim REPLACE_GETPAGESIZE!$REPLACE_GETPAGESIZE$ac_delim REPLACE_LCHOWN!$REPLACE_LCHOWN$ac_delim REPLACE_LSEEK!$REPLACE_LSEEK$ac_delim +REPLACE_WRITE!$REPLACE_WRITE$ac_delim +UNISTD_H_HAVE_WINSOCK2_H!$UNISTD_H_HAVE_WINSOCK2_H$ac_delim LIB_CLOCK_GETTIME!$LIB_CLOCK_GETTIME$ac_delim +GNULIB_DIRFD!$GNULIB_DIRFD$ac_delim +HAVE_DECL_DIRFD!$HAVE_DECL_DIRFD$ac_delim +DIRENT_H!$DIRENT_H$ac_delim +INCLUDE_NEXT!$INCLUDE_NEXT$ac_delim +PRAGMA_SYSTEM_HEADER!$PRAGMA_SYSTEM_HEADER$ac_delim +NEXT_DIRENT_H!$NEXT_DIRENT_H$ac_delim build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim @@ -38241,25 +40711,31 @@ host!$host$ac_delim host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim -INCLUDE_NEXT!$INCLUDE_NEXT$ac_delim -NEXT_DIRENT_H!$NEXT_DIRENT_H$ac_delim -DIRENT_H!$DIRENT_H$ac_delim +NEXT_ERRNO_H!$NEXT_ERRNO_H$ac_delim +ERRNO_H!$ERRNO_H$ac_delim +EMULTIHOP_HIDDEN!$EMULTIHOP_HIDDEN$ac_delim +EMULTIHOP_VALUE!$EMULTIHOP_VALUE$ac_delim +ENOLINK_HIDDEN!$ENOLINK_HIDDEN$ac_delim +ENOLINK_VALUE!$ENOLINK_VALUE$ac_delim +EOVERFLOW_HIDDEN!$EOVERFLOW_HIDDEN$ac_delim +EOVERFLOW_VALUE!$EOVERFLOW_VALUE$ac_delim GNULIB_OPEN!$GNULIB_OPEN$ac_delim REPLACE_OPEN!$REPLACE_OPEN$ac_delim -NEXT_FCNTL_H!$NEXT_FCNTL_H$ac_delim -FCNTL_H!$FCNTL_H$ac_delim -NEXT_FLOAT_H!$NEXT_FLOAT_H$ac_delim -FLOAT_H!$FLOAT_H$ac_delim -FNMATCH_H!$FNMATCH_H$ac_delim +GNULIB_FPRINTF!$GNULIB_FPRINTF$ac_delim GNULIB_FPRINTF_POSIX!$GNULIB_FPRINTF_POSIX$ac_delim +GNULIB_PRINTF!$GNULIB_PRINTF$ac_delim GNULIB_PRINTF_POSIX!$GNULIB_PRINTF_POSIX$ac_delim GNULIB_SNPRINTF!$GNULIB_SNPRINTF$ac_delim GNULIB_SPRINTF_POSIX!$GNULIB_SPRINTF_POSIX$ac_delim +GNULIB_VFPRINTF!$GNULIB_VFPRINTF$ac_delim GNULIB_VFPRINTF_POSIX!$GNULIB_VFPRINTF_POSIX$ac_delim +GNULIB_VPRINTF!$GNULIB_VPRINTF$ac_delim GNULIB_VPRINTF_POSIX!$GNULIB_VPRINTF_POSIX$ac_delim GNULIB_VSNPRINTF!$GNULIB_VSNPRINTF$ac_delim GNULIB_VSPRINTF_POSIX!$GNULIB_VSPRINTF_POSIX$ac_delim GNULIB_VASPRINTF!$GNULIB_VASPRINTF$ac_delim +GNULIB_OBSTACK_PRINTF!$GNULIB_OBSTACK_PRINTF$ac_delim +GNULIB_OBSTACK_PRINTF_POSIX!$GNULIB_OBSTACK_PRINTF_POSIX$ac_delim GNULIB_FOPEN!$GNULIB_FOPEN$ac_delim GNULIB_FREOPEN!$GNULIB_FREOPEN$ac_delim GNULIB_FSEEK!$GNULIB_FSEEK$ac_delim @@ -38267,49 +40743,20 @@ GNULIB_FSEEKO!$GNULIB_FSEEKO$ac_delim GNULIB_FTELL!$GNULIB_FTELL$ac_delim GNULIB_FTELLO!$GNULIB_FTELLO$ac_delim GNULIB_FFLUSH!$GNULIB_FFLUSH$ac_delim +GNULIB_FCLOSE!$GNULIB_FCLOSE$ac_delim +GNULIB_FPUTC!$GNULIB_FPUTC$ac_delim +GNULIB_PUTC!$GNULIB_PUTC$ac_delim +GNULIB_PUTCHAR!$GNULIB_PUTCHAR$ac_delim +GNULIB_FPUTS!$GNULIB_FPUTS$ac_delim +GNULIB_PUTS!$GNULIB_PUTS$ac_delim +GNULIB_FWRITE!$GNULIB_FWRITE$ac_delim GNULIB_GETDELIM!$GNULIB_GETDELIM$ac_delim GNULIB_GETLINE!$GNULIB_GETLINE$ac_delim +GNULIB_PERROR!$GNULIB_PERROR$ac_delim +GNULIB_STDIO_H_SIGPIPE!$GNULIB_STDIO_H_SIGPIPE$ac_delim +REPLACE_STDIO_WRITE_FUNCS!$REPLACE_STDIO_WRITE_FUNCS$ac_delim REPLACE_FPRINTF!$REPLACE_FPRINTF$ac_delim REPLACE_VFPRINTF!$REPLACE_VFPRINTF$ac_delim -REPLACE_PRINTF!$REPLACE_PRINTF$ac_delim -REPLACE_VPRINTF!$REPLACE_VPRINTF$ac_delim -REPLACE_SNPRINTF!$REPLACE_SNPRINTF$ac_delim -HAVE_DECL_SNPRINTF!$HAVE_DECL_SNPRINTF$ac_delim -REPLACE_VSNPRINTF!$REPLACE_VSNPRINTF$ac_delim -HAVE_DECL_VSNPRINTF!$HAVE_DECL_VSNPRINTF$ac_delim -REPLACE_SPRINTF!$REPLACE_SPRINTF$ac_delim -REPLACE_VSPRINTF!$REPLACE_VSPRINTF$ac_delim -HAVE_VASPRINTF!$HAVE_VASPRINTF$ac_delim -REPLACE_VASPRINTF!$REPLACE_VASPRINTF$ac_delim -REPLACE_FOPEN!$REPLACE_FOPEN$ac_delim -REPLACE_FREOPEN!$REPLACE_FREOPEN$ac_delim -HAVE_FSEEKO!$HAVE_FSEEKO$ac_delim -REPLACE_FSEEKO!$REPLACE_FSEEKO$ac_delim -REPLACE_FSEEK!$REPLACE_FSEEK$ac_delim -HAVE_FTELLO!$HAVE_FTELLO$ac_delim -REPLACE_FTELLO!$REPLACE_FTELLO$ac_delim -REPLACE_FTELL!$REPLACE_FTELL$ac_delim -REPLACE_FFLUSH!$REPLACE_FFLUSH$ac_delim -HAVE_DECL_GETDELIM!$HAVE_DECL_GETDELIM$ac_delim -HAVE_DECL_GETLINE!$HAVE_DECL_GETLINE$ac_delim -REPLACE_GETLINE!$REPLACE_GETLINE$ac_delim -LIBINTL!$LIBINTL$ac_delim -LTLIBINTL!$LTLIBINTL$ac_delim -NEXT_SYS_TIME_H!$NEXT_SYS_TIME_H$ac_delim -HAVE_SYS_TIME_H!$HAVE_SYS_TIME_H$ac_delim -HAVE_STRUCT_TIMEVAL!$HAVE_STRUCT_TIMEVAL$ac_delim -REPLACE_GETTIMEOFDAY!$REPLACE_GETTIMEOFDAY$ac_delim -SYS_TIME_H!$SYS_TIME_H$ac_delim -HAVE_LONG_LONG_INT!$HAVE_LONG_LONG_INT$ac_delim -HAVE_UNSIGNED_LONG_LONG_INT!$HAVE_UNSIGNED_LONG_LONG_INT$ac_delim -HAVE_INTTYPES_H!$HAVE_INTTYPES_H$ac_delim -HAVE_SYS_TYPES_H!$HAVE_SYS_TYPES_H$ac_delim -NEXT_STDINT_H!$NEXT_STDINT_H$ac_delim -HAVE_STDINT_H!$HAVE_STDINT_H$ac_delim -HAVE_SYS_INTTYPES_H!$HAVE_SYS_INTTYPES_H$ac_delim -HAVE_SYS_BITYPES_H!$HAVE_SYS_BITYPES_H$ac_delim -BITSIZEOF_PTRDIFF_T!$BITSIZEOF_PTRDIFF_T$ac_delim -BITSIZEOF_SIG_ATOMIC_T!$BITSIZEOF_SIG_ATOMIC_T$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -38351,6 +40798,54 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +REPLACE_PRINTF!$REPLACE_PRINTF$ac_delim +REPLACE_VPRINTF!$REPLACE_VPRINTF$ac_delim +REPLACE_SNPRINTF!$REPLACE_SNPRINTF$ac_delim +HAVE_DECL_SNPRINTF!$HAVE_DECL_SNPRINTF$ac_delim +REPLACE_VSNPRINTF!$REPLACE_VSNPRINTF$ac_delim +HAVE_DECL_VSNPRINTF!$HAVE_DECL_VSNPRINTF$ac_delim +REPLACE_SPRINTF!$REPLACE_SPRINTF$ac_delim +REPLACE_VSPRINTF!$REPLACE_VSPRINTF$ac_delim +HAVE_VASPRINTF!$HAVE_VASPRINTF$ac_delim +REPLACE_VASPRINTF!$REPLACE_VASPRINTF$ac_delim +HAVE_DECL_OBSTACK_PRINTF!$HAVE_DECL_OBSTACK_PRINTF$ac_delim +REPLACE_OBSTACK_PRINTF!$REPLACE_OBSTACK_PRINTF$ac_delim +REPLACE_FOPEN!$REPLACE_FOPEN$ac_delim +REPLACE_FREOPEN!$REPLACE_FREOPEN$ac_delim +HAVE_FSEEKO!$HAVE_FSEEKO$ac_delim +REPLACE_FSEEKO!$REPLACE_FSEEKO$ac_delim +REPLACE_FSEEK!$REPLACE_FSEEK$ac_delim +HAVE_FTELLO!$HAVE_FTELLO$ac_delim +REPLACE_FTELLO!$REPLACE_FTELLO$ac_delim +REPLACE_FTELL!$REPLACE_FTELL$ac_delim +REPLACE_FFLUSH!$REPLACE_FFLUSH$ac_delim +REPLACE_FCLOSE!$REPLACE_FCLOSE$ac_delim +HAVE_DECL_GETDELIM!$HAVE_DECL_GETDELIM$ac_delim +HAVE_DECL_GETLINE!$HAVE_DECL_GETLINE$ac_delim +REPLACE_GETLINE!$REPLACE_GETLINE$ac_delim +REPLACE_PERROR!$REPLACE_PERROR$ac_delim +NEXT_FCNTL_H!$NEXT_FCNTL_H$ac_delim +FCNTL_H!$FCNTL_H$ac_delim +NEXT_FLOAT_H!$NEXT_FLOAT_H$ac_delim +FLOAT_H!$FLOAT_H$ac_delim +FNMATCH_H!$FNMATCH_H$ac_delim +LIBINTL!$LIBINTL$ac_delim +LTLIBINTL!$LTLIBINTL$ac_delim +NEXT_SYS_TIME_H!$NEXT_SYS_TIME_H$ac_delim +HAVE_SYS_TIME_H!$HAVE_SYS_TIME_H$ac_delim +HAVE_STRUCT_TIMEVAL!$HAVE_STRUCT_TIMEVAL$ac_delim +REPLACE_GETTIMEOFDAY!$REPLACE_GETTIMEOFDAY$ac_delim +SYS_TIME_H!$SYS_TIME_H$ac_delim +HAVE_LONG_LONG_INT!$HAVE_LONG_LONG_INT$ac_delim +HAVE_UNSIGNED_LONG_LONG_INT!$HAVE_UNSIGNED_LONG_LONG_INT$ac_delim +HAVE_INTTYPES_H!$HAVE_INTTYPES_H$ac_delim +HAVE_SYS_TYPES_H!$HAVE_SYS_TYPES_H$ac_delim +NEXT_STDINT_H!$NEXT_STDINT_H$ac_delim +HAVE_STDINT_H!$HAVE_STDINT_H$ac_delim +HAVE_SYS_INTTYPES_H!$HAVE_SYS_INTTYPES_H$ac_delim +HAVE_SYS_BITYPES_H!$HAVE_SYS_BITYPES_H$ac_delim +BITSIZEOF_PTRDIFF_T!$BITSIZEOF_PTRDIFF_T$ac_delim +BITSIZEOF_SIG_ATOMIC_T!$BITSIZEOF_SIG_ATOMIC_T$ac_delim BITSIZEOF_SIZE_T!$BITSIZEOF_SIZE_T$ac_delim BITSIZEOF_WCHAR_T!$BITSIZEOF_WCHAR_T$ac_delim BITSIZEOF_WINT_T!$BITSIZEOF_WINT_T$ac_delim @@ -38381,24 +40876,84 @@ UINT64_MAX_EQ_ULONG_MAX!$UINT64_MAX_EQ_ULONG_MAX$ac_delim INTTYPES_H!$INTTYPES_H$ac_delim GLIBC21!$GLIBC21$ac_delim LOCALCHARSET_TESTS_ENVIRONMENT!$LOCALCHARSET_TESTS_ENVIRONMENT$ac_delim +GNULIB_LCHMOD!$GNULIB_LCHMOD$ac_delim +GNULIB_LSTAT!$GNULIB_LSTAT$ac_delim +HAVE_LCHMOD!$HAVE_LCHMOD$ac_delim +REPLACE_LSTAT!$REPLACE_LSTAT$ac_delim +REPLACE_MKDIR!$REPLACE_MKDIR$ac_delim HAVE_MALLOC_POSIX!$HAVE_MALLOC_POSIX$ac_delim GNULIB_MALLOC_POSIX!$GNULIB_MALLOC_POSIX$ac_delim GNULIB_REALLOC_POSIX!$GNULIB_REALLOC_POSIX$ac_delim GNULIB_CALLOC_POSIX!$GNULIB_CALLOC_POSIX$ac_delim +GNULIB_ATOLL!$GNULIB_ATOLL$ac_delim +GNULIB_GETLOADAVG!$GNULIB_GETLOADAVG$ac_delim GNULIB_GETSUBOPT!$GNULIB_GETSUBOPT$ac_delim GNULIB_MKDTEMP!$GNULIB_MKDTEMP$ac_delim GNULIB_MKSTEMP!$GNULIB_MKSTEMP$ac_delim GNULIB_PUTENV!$GNULIB_PUTENV$ac_delim +GNULIB_RANDOM_R!$GNULIB_RANDOM_R$ac_delim +GNULIB_RPMATCH!$GNULIB_RPMATCH$ac_delim GNULIB_SETENV!$GNULIB_SETENV$ac_delim GNULIB_STRTOD!$GNULIB_STRTOD$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +GNULIB_STRTOLL!$GNULIB_STRTOLL$ac_delim +GNULIB_STRTOULL!$GNULIB_STRTOULL$ac_delim GNULIB_UNSETENV!$GNULIB_UNSETENV$ac_delim +HAVE_ATOLL!$HAVE_ATOLL$ac_delim HAVE_CALLOC_POSIX!$HAVE_CALLOC_POSIX$ac_delim HAVE_GETSUBOPT!$HAVE_GETSUBOPT$ac_delim HAVE_MKDTEMP!$HAVE_MKDTEMP$ac_delim HAVE_REALLOC_POSIX!$HAVE_REALLOC_POSIX$ac_delim +HAVE_RANDOM_R!$HAVE_RANDOM_R$ac_delim +HAVE_RPMATCH!$HAVE_RPMATCH$ac_delim HAVE_SETENV!$HAVE_SETENV$ac_delim HAVE_STRTOD!$HAVE_STRTOD$ac_delim +HAVE_STRTOLL!$HAVE_STRTOLL$ac_delim +HAVE_STRTOULL!$HAVE_STRTOULL$ac_delim +HAVE_STRUCT_RANDOM_DATA!$HAVE_STRUCT_RANDOM_DATA$ac_delim +HAVE_SYS_LOADAVG_H!$HAVE_SYS_LOADAVG_H$ac_delim HAVE_UNSETENV!$HAVE_UNSETENV$ac_delim +HAVE_DECL_GETLOADAVG!$HAVE_DECL_GETLOADAVG$ac_delim REPLACE_MKSTEMP!$REPLACE_MKSTEMP$ac_delim REPLACE_PUTENV!$REPLACE_PUTENV$ac_delim REPLACE_STRTOD!$REPLACE_STRTOD$ac_delim @@ -38406,6 +40961,7 @@ VOID_UNSETENV!$VOID_UNSETENV$ac_delim GNULIB_MEMMEM!$GNULIB_MEMMEM$ac_delim GNULIB_MEMPCPY!$GNULIB_MEMPCPY$ac_delim GNULIB_MEMRCHR!$GNULIB_MEMRCHR$ac_delim +GNULIB_RAWMEMCHR!$GNULIB_RAWMEMCHR$ac_delim GNULIB_STPCPY!$GNULIB_STPCPY$ac_delim GNULIB_STPNCPY!$GNULIB_STPNCPY$ac_delim GNULIB_STRCHRNUL!$GNULIB_STRCHRNUL$ac_delim @@ -38433,9 +40989,11 @@ GNULIB_MBSSEP!$GNULIB_MBSSEP$ac_delim GNULIB_MBSTOK_R!$GNULIB_MBSTOK_R$ac_delim GNULIB_STRERROR!$GNULIB_STRERROR$ac_delim GNULIB_STRSIGNAL!$GNULIB_STRSIGNAL$ac_delim +GNULIB_STRVERSCMP!$GNULIB_STRVERSCMP$ac_delim HAVE_DECL_MEMMEM!$HAVE_DECL_MEMMEM$ac_delim HAVE_MEMPCPY!$HAVE_MEMPCPY$ac_delim HAVE_DECL_MEMRCHR!$HAVE_DECL_MEMRCHR$ac_delim +HAVE_RAWMEMCHR!$HAVE_RAWMEMCHR$ac_delim HAVE_STPCPY!$HAVE_STPCPY$ac_delim HAVE_STPNCPY!$HAVE_STPNCPY$ac_delim HAVE_STRCHRNUL!$HAVE_STRCHRNUL$ac_delim @@ -38448,6 +41006,33 @@ HAVE_STRSEP!$HAVE_STRSEP$ac_delim HAVE_STRCASESTR!$HAVE_STRCASESTR$ac_delim HAVE_DECL_STRTOK_R!$HAVE_DECL_STRTOK_R$ac_delim HAVE_DECL_STRERROR!$HAVE_DECL_STRERROR$ac_delim +HAVE_DECL_STRSIGNAL!$HAVE_DECL_STRSIGNAL$ac_delim +HAVE_STRVERSCMP!$HAVE_STRVERSCMP$ac_delim +REPLACE_MEMMEM!$REPLACE_MEMMEM$ac_delim +REPLACE_STRDUP!$REPLACE_STRDUP$ac_delim +REPLACE_STRSTR!$REPLACE_STRSTR$ac_delim +REPLACE_STRCASESTR!$REPLACE_STRCASESTR$ac_delim +REPLACE_STRERROR!$REPLACE_STRERROR$ac_delim +REPLACE_STRSIGNAL!$REPLACE_STRSIGNAL$ac_delim +STDARG_H!$STDARG_H$ac_delim +NEXT_STDARG_H!$NEXT_STDARG_H$ac_delim +NEXT_STDIO_H!$NEXT_STDIO_H$ac_delim +NEXT_STDLIB_H!$NEXT_STDLIB_H$ac_delim +HAVE_STRCASECMP!$HAVE_STRCASECMP$ac_delim +HAVE_DECL_STRNCASECMP!$HAVE_DECL_STRNCASECMP$ac_delim +NEXT_STRING_H!$NEXT_STRING_H$ac_delim +NEXT_STRINGS_H!$NEXT_STRINGS_H$ac_delim +HAVE_LSTAT!$HAVE_LSTAT$ac_delim +NEXT_SYS_STAT_H!$NEXT_SYS_STAT_H$ac_delim +SYS_STAT_H!$SYS_STAT_H$ac_delim +NEXT_SYSEXITS_H!$NEXT_SYSEXITS_H$ac_delim +HAVE_SYSEXITS_H!$HAVE_SYSEXITS_H$ac_delim +SYSEXITS_H!$SYSEXITS_H$ac_delim +REPLACE_LOCALTIME_R!$REPLACE_LOCALTIME_R$ac_delim +REPLACE_NANOSLEEP!$REPLACE_NANOSLEEP$ac_delim +REPLACE_STRPTIME!$REPLACE_STRPTIME$ac_delim +REPLACE_TIMEGM!$REPLACE_TIMEGM$ac_delim +NEXT_TIME_H!$NEXT_TIME_H$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -38468,7 +41053,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF sed ' @@ -38489,33 +41074,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -HAVE_DECL_STRSIGNAL!$HAVE_DECL_STRSIGNAL$ac_delim -REPLACE_STRERROR!$REPLACE_STRERROR$ac_delim -REPLACE_STRSIGNAL!$REPLACE_STRSIGNAL$ac_delim -REPLACE_MEMMEM!$REPLACE_MEMMEM$ac_delim -REPLACE_STRCASESTR!$REPLACE_STRCASESTR$ac_delim -REPLACE_STRSTR!$REPLACE_STRSTR$ac_delim -STDARG_H!$STDARG_H$ac_delim -NEXT_STDARG_H!$NEXT_STDARG_H$ac_delim -NEXT_STDIO_H!$NEXT_STDIO_H$ac_delim -NEXT_STDLIB_H!$NEXT_STDLIB_H$ac_delim -HAVE_STRCASECMP!$HAVE_STRCASECMP$ac_delim -HAVE_DECL_STRNCASECMP!$HAVE_DECL_STRNCASECMP$ac_delim -NEXT_STRING_H!$NEXT_STRING_H$ac_delim -NEXT_STRINGS_H!$NEXT_STRINGS_H$ac_delim -HAVE_LSTAT!$HAVE_LSTAT$ac_delim -HAVE_DECL_MKDIR!$HAVE_DECL_MKDIR$ac_delim -HAVE_IO_H!$HAVE_IO_H$ac_delim -NEXT_SYS_STAT_H!$NEXT_SYS_STAT_H$ac_delim -SYS_STAT_H!$SYS_STAT_H$ac_delim -NEXT_SYSEXITS_H!$NEXT_SYSEXITS_H$ac_delim -HAVE_SYSEXITS_H!$HAVE_SYSEXITS_H$ac_delim -SYSEXITS_H!$SYSEXITS_H$ac_delim -REPLACE_LOCALTIME_R!$REPLACE_LOCALTIME_R$ac_delim -REPLACE_NANOSLEEP!$REPLACE_NANOSLEEP$ac_delim -REPLACE_STRPTIME!$REPLACE_STRPTIME$ac_delim -REPLACE_TIMEGM!$REPLACE_TIMEGM$ac_delim -NEXT_TIME_H!$NEXT_TIME_H$ac_delim TIME_H_DEFINES_STRUCT_TIMESPEC!$TIME_H_DEFINES_STRUCT_TIMESPEC$ac_delim SYS_TIME_H_DEFINES_STRUCT_TIMESPEC!$SYS_TIME_H_DEFINES_STRUCT_TIMESPEC$ac_delim NEXT_UNISTD_H!$NEXT_UNISTD_H$ac_delim @@ -38524,13 +41082,14 @@ GNULIB_WCWIDTH!$GNULIB_WCWIDTH$ac_delim HAVE_DECL_WCWIDTH!$HAVE_DECL_WCWIDTH$ac_delim REPLACE_WCWIDTH!$REPLACE_WCWIDTH$ac_delim WCHAR_H!$WCHAR_H$ac_delim +HAVE_WINT_T!$HAVE_WINT_T$ac_delim HAVE_WCHAR_H!$HAVE_WCHAR_H$ac_delim NEXT_WCHAR_H!$NEXT_WCHAR_H$ac_delim HAVE_ISWCNTRL!$HAVE_ISWCNTRL$ac_delim -HAVE_WINT_T!$HAVE_WINT_T$ac_delim NEXT_WCTYPE_H!$NEXT_WCTYPE_H$ac_delim HAVE_WCTYPE_H!$HAVE_WCTYPE_H$ac_delim WCTYPE_H!$WCTYPE_H$ac_delim +REPLACE_ISWCNTRL!$REPLACE_ISWCNTRL$ac_delim LIBTAR_LIBDEPS!$LIBTAR_LIBDEPS$ac_delim LIBTAR_LTLIBDEPS!$LIBTAR_LTLIBDEPS$ac_delim LIB_SETSOCKOPT!$LIB_SETSOCKOPT$ac_delim @@ -38568,7 +41127,7 @@ gltests_LIBOBJS!$gltests_LIBOBJS$ac_delim gltests_LTLIBOBJS!$gltests_LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -38586,7 +41145,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -38855,7 +41414,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && diff --git a/configure.ac b/configure.ac index 27d2e32..6912812 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Configure template for GNU tar. +# Configure template for GNU tar. -*- autoconf -*- # Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AC_INIT([GNU tar], [1.20], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.21], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h:config.hin]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 73bebcd..c01077a 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -46,19 +46,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.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/closeout.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/eoverflow.m4 \ + $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fcntl-safer.m4 \ - $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fileblocks.m4 \ - $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ - $(top_srcdir)/m4/ftruncate.m4 \ + $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ + $(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl_h.m4 \ + $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/float_h.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ + $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getdelim.m4 \ @@ -83,41 +84,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.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/setenv.m4 \ - $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/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/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/sys_stat_h.m4 \ - $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ - $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/sleep.m4 \ + $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ + $(top_srcdir)/m4/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/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/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac @@ -184,7 +187,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EOVERFLOW = @EOVERFLOW@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FCNTL_H = @FCNTL_H@ FLOAT_H = @FLOAT_H@ @@ -194,30 +203,47 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_DIRFD = @GNULIB_DIRFD@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ GNULIB_FTELLO = @GNULIB_FTELLO@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FWRITE = @GNULIB_FWRITE@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ @@ -238,15 +264,26 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ GNULIB_STPCPY = @GNULIB_STPCPY@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ @@ -262,25 +299,35 @@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ATOLL = @HAVE_ATOLL@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ +HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ +HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ @@ -294,22 +341,31 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DUP2 = @HAVE_DUP2@ +HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ +HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ +HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_IO_H = @HAVE_IO_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_R = @HAVE_RANDOM_R@ +HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_RPMATCH = @HAVE_RPMATCH@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -325,10 +381,15 @@ HAVE_STRNDUP = @HAVE_STRNDUP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOLL = @HAVE_STRTOLL@ +HAVE_STRTOULL = @HAVE_STRTOULL@ +HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ +HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ @@ -370,6 +431,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -395,13 +457,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ +PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ REPLACE_CHOWN = @REPLACE_CHOWN@ +REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ +REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -414,18 +479,25 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ +REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRPTIME = @REPLACE_STRPTIME@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ @@ -438,6 +510,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -453,6 +526,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ diff --git a/doc/getdate.texi b/doc/getdate.texi index eae4526..7175e3d 100644 --- a/doc/getdate.texi +++ b/doc/getdate.texi @@ -265,16 +265,19 @@ which uses @samp{12m} for noon and @samp{12pm} for midnight.) The time may alternatively be followed by a time zone correction, expressed as @samp{@var{s}@var{hh}@var{mm}}, where @var{s} is @samp{+} or @samp{-}, @var{hh} is a number of zone hours and @var{mm} is a number -of zone minutes. You can also separate @var{hh} from @var{mm} with a colon. +of zone minutes. +The zone minutes term, @var{mm}, may be omitted, in which case +the one- or two-digit correction is interpreted as a number of hours. +You can also separate @var{hh} from @var{mm} with a colon. When a time zone correction is given this way, it forces interpretation of the time relative to Coordinated Universal Time (@sc{utc}), overriding any previous specification for the time zone or the local time zone. For example, @samp{+0530} and @samp{+05:30} both stand for the time zone 5.5 hours -ahead of @sc{utc} (e.g., India). The @var{minute} -part of the time of day may not be elided when a time zone correction -is used. This is the best way to specify a time zone correction by -fractional parts of an hour. +ahead of @sc{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 @samp{am}/@samp{pm} or a time zone correction may be specified, but not both. diff --git a/doc/stamp-vti b/doc/stamp-vti index 580b586..eb2c3a0 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 14 April 2008 -@set UPDATED-MONTH April 2008 -@set EDITION 1.20 -@set VERSION 1.20 +@set UPDATED 30 October 2008 +@set UPDATED-MONTH October 2008 +@set EDITION 1.21 +@set VERSION 1.21 diff --git a/doc/tar.info b/doc/tar.info index 542ce30..9f26ab4 100644 --- a/doc/tar.info +++ b/doc/tar.info @@ -1,6 +1,6 @@ -This is tar.info, produced by makeinfo version 4.8.90 from tar.texi. +This is tar.info, produced by makeinfo version 4.13 from tar.texi. - This manual is for GNU `tar' (version 1.20, 14 April 2008), which +This manual is for GNU `tar' (version 1.21, 30 October 2008), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -30,373 +30,376 @@ END-INFO-DIR-ENTRY  Indirect: -tar.info-1: 1246 -tar.info-2: 303205 +tar.info-1: 1243 +tar.info-2: 300672  Tag Table: (Indirect) -Node: Top1246 -Node: Introduction10511 -Node: Book Contents11298 -Node: Definitions13470 -Node: What tar Does15273 -Node: Naming tar Archives18039 -Node: Authors18759 -Node: Reports20572 -Node: Tutorial20932 -Node: assumptions21745 -Node: stylistic conventions24220 -Node: basic tar options24663 -Node: frequent operations28301 -Node: Two Frequent Options28953 -Node: file tutorial29584 -Node: verbose tutorial30945 -Ref: verbose member listing33159 -Node: help tutorial35912 -Node: create36266 -Node: prepare for examples37767 -Node: Creating the archive39535 -Node: create verbose42367 -Node: short create43188 -Node: create dir45941 -Node: list48648 -Ref: listing member and file names49922 -Node: list dir52203 -Node: extract53192 -Node: extracting archives54369 -Node: extracting files54859 -Ref: extracting files-Footnote-157506 -Node: extract dir57886 -Node: extracting untrusted archives60269 -Node: failing commands61148 -Node: going further62248 -Node: tar invocation62461 -Node: Synopsis63973 -Node: using tar options68942 -Ref: TAR_OPTIONS70527 -Node: Styles71544 -Node: Long Options73256 -Node: Short Options75428 -Ref: Short Options-Footnote-177236 -Node: Old Options77453 -Ref: Old Options-Footnote-180403 -Node: Mixing80573 -Ref: Mixing-Footnote-182939 -Node: All Options83059 -Node: Operation Summary83664 -Ref: --append83784 -Ref: --catenate83864 -Ref: --compare83935 -Ref: --concatenate84138 -Ref: --create84248 -Ref: --delete84316 -Ref: --diff84429 -Ref: --extract84485 -Ref: --get84587 -Ref: --list84645 -Ref: --update84713 -Node: Option Summary84923 -Ref: --absolute-names85078 -Ref: --after-date85256 -Ref: --anchored85308 -Ref: --atime-preserve85441 -Ref: --auto-compress87956 -Ref: --backup88112 -Ref: --block-number88303 -Ref: --blocking-factor88477 -Ref: --bzip288629 -Ref: --check-device88736 -Ref: --checkpoint88931 -Ref: --checkpoint-action89372 -Ref: --check-links90523 -Ref: --compress90800 -Ref: --uncompress90800 -Ref: --confirmation91004 -Ref: --delay-directory-restore91072 -Ref: --dereference91273 -Ref: --directory91458 -Ref: --exclude91711 -Ref: --exclude-from91830 -Ref: --exclude-caches91976 -Ref: --exclude-caches-under92170 -Ref: --exclude-caches-all92348 -Ref: --exclude-tag92477 -Ref: --exclude-tag-under92632 -Ref: --exclude-tag-all92800 -Ref: --exclude-vcs92914 -Ref: --file93069 -Ref: --files-from93269 -Ref: --force-local93472 -Ref: --format93663 -Ref: --group94333 -Ref: --gzip94681 -Ref: --gunzip94681 -Ref: --ungzip94681 -Ref: --hard-dereference94904 -Ref: --help95091 -Ref: --ignore-case95225 -Ref: --ignore-command-error95352 -Ref: --ignore-failed-read95463 -Ref: --ignore-zeros95593 -Ref: --incremental95738 -Ref: --index-file96003 -Ref: --info-script96088 -Ref: --new-volume-script96088 -Ref: --interactive96409 -Ref: --keep-newer-files96621 -Ref: --keep-old-files96763 -Ref: --label96894 -Ref: --listed-incremental97182 -Ref: --lzma97546 -Ref: --mode97646 -Ref: --mtime97937 -Ref: --multi-volume98378 -Ref: --newer98579 -Ref: --newer-mtime98857 -Ref: --no-anchored99081 -Ref: --no-check-device99218 -Ref: --no-delay-directory-restore99401 -Ref: --no-ignore-case99654 -Ref: --no-ignore-command-error99747 -Ref: --no-overwrite-dir99902 -Ref: --no-quote-chars100045 -Ref: --no-recursion100226 -Ref: --no-same-owner100331 -Ref: --no-same-permissions100514 -Ref: --no-unquote100716 -Ref: --no-wildcards100854 -Ref: --no-wildcards-match-slash100938 -Ref: --null101040 -Ref: --numeric-owner101268 -Ref: --occurrence101919 -Ref: --old-archive102486 -Ref: --one-file-system102535 -Ref: --overwrite102713 -Ref: --overwrite-dir102855 -Ref: --owner103000 -Ref: --pax-option103379 -Ref: --portability103678 -Ref: --posix103743 -Ref: --preserve103785 -Ref: --preserve-order103923 -Ref: --preserve-permissions103987 -Ref: --same-permissions103987 -Ref: --quote-chars104401 -Ref: --quoting-style104554 -Ref: --read-full-records104875 -Ref: --record-size105040 -Ref: --recursion105171 -Ref: --recursive-unlink105274 -Ref: --remove-files105441 -Ref: --restrict105587 -Ref: --rmt-command105775 -Ref: --rsh-command105916 -Ref: --same-order106038 -Ref: --same-owner106330 -Ref: --seek106707 -Ref: --show-defaults106964 -Ref: --show-omitted-dirs107332 -Ref: --show-transformed-names107486 -Ref: --show-stored-names107486 -Ref: --sparse107875 -Ref: --sparse-version108014 -Ref: --starting-file108238 -Ref: --strip-components108427 -Ref: --suffix108739 -Ref: --tape-length108874 -Ref: --test-label109029 -Ref: --to-command109181 -Ref: --to-stdout109340 -Ref: --totals109493 -Ref: --touch109724 -Ref: --transform109926 -Ref: --unlink-first110518 -Ref: --unquote110686 -Ref: --use-compress-program110793 -Ref: --utc110961 -Ref: --verbose111054 -Ref: --verify111306 -Ref: --version111424 -Ref: --volno-file111596 -Ref: --wildcards111783 -Ref: --wildcards-match-slash111903 -Ref: Option Summary-Footnote-1112031 -Node: Short Option Summary112249 -Node: help114420 -Ref: help-Footnote-1118250 -Node: defaults118460 -Node: verbose119477 -Ref: totals121778 -Ref: Progress information123368 -Ref: show-omitted-dirs124347 -Ref: block-number124766 -Ref: verbose-Footnote-1125793 -Node: checkpoints125900 -Node: interactive131291 -Node: operations133374 -Node: Basic tar133633 -Ref: Basic tar-Footnote-1136737 -Node: Advanced tar136881 -Node: Operations137726 -Node: append139696 -Ref: append-Footnote-1142861 -Node: appending files143027 -Node: multiple144808 -Node: update147498 -Node: how to update148537 -Node: concatenate150320 -Ref: concatenate-Footnote-1153569 -Node: delete153707 -Node: compare155550 -Node: create options157040 -Node: override157498 -Node: Ignore Failed Read160936 -Node: extract options161156 -Node: Reading162052 -Node: read full records163615 -Node: Ignore Zeros163951 -Node: Writing164942 -Node: Dealing with Old Files165499 -Node: Overwrite Old Files167926 -Node: Keep Old Files169383 -Node: Keep Newer Files169893 -Node: Unlink First170183 -Node: Recursive Unlink170587 -Node: Data Modification Times171140 -Node: Setting Access Permissions171950 -Node: Directory Modification Times and Permissions172582 -Node: Writing to Standard Output176188 -Node: Writing to an External Program177723 -Node: remove files180460 -Node: Scarce180653 -Node: Starting File180901 -Node: Same Order181721 -Node: backup182557 -Node: Applications185781 -Node: looking ahead187294 -Node: Backups188120 -Node: Full Dumps189952 -Node: Incremental Dumps191758 -Ref: device numbers194894 -Ref: incremental-op198876 -Ref: Incremental Dumps-Footnote-1199250 -Ref: Incremental Dumps-Footnote-2199400 -Node: Backup Levels199887 -Node: Backup Parameters202274 -Node: General-Purpose Variables203455 -Ref: RSH206612 -Node: Magnetic Tape Control208491 -Node: User Hooks209828 -Node: backup-specs example211156 -Node: Scripted Backups212299 -Ref: Scripted Backups-Footnote-1215161 -Node: Scripted Restoration215545 -Node: Choosing218153 -Node: file219338 -Ref: remote-dev222037 -Ref: local and remote archives222429 -Node: Selecting Archive Members223459 -Ref: input name quoting224140 -Node: files226126 -Ref: files-Footnote-1229400 -Node: nul229558 -Node: exclude230855 -Node: problems with exclude235619 -Node: wildcards237664 -Node: controlling pattern-matching240248 -Ref: controlling pattern-matching-Footnote-1244238 -Node: quoting styles244454 -Ref: escape sequences244800 -Node: transform250936 -Ref: show-transformed-names252926 -Node: after256915 -Node: recurse260580 -Node: one263349 -Node: directory264845 -Node: absolute267918 -Ref: absolute-Footnote-1271108 -Node: Date input formats271459 -Node: General date syntax273775 -Node: Calendar date items276726 -Node: Time of day items278723 -Node: Time zone items280839 -Node: Day of week items282073 -Node: Relative items in date strings283062 -Node: Pure numbers in date strings285864 -Node: Seconds since the Epoch286845 -Node: Specifying time zone rules288466 -Node: Authors of get_date290830 -Node: Formats291582 -Node: Compression296270 -Node: gzip296562 -Ref: auto-compress299320 -Ref: gzip-Footnote-1303156 -Node: sparse303205 -Node: Attributes306259 -Node: Portability312230 -Node: Portable Names313716 -Node: dereference314421 -Node: hard links315822 -Ref: hard links-Footnote-1318780 -Node: old318836 -Node: ustar320020 -Node: gnu320611 -Node: posix321488 -Node: PAX keywords321969 -Node: Checksumming326297 -Node: Large or Negative Values328221 -Node: Other Tars329821 -Node: Split Recovery330957 -Node: Sparse Recovery334689 -Ref: extracting sparse v.0.x338322 -Ref: Sparse Recovery-Footnote-1341611 -Ref: Sparse Recovery-Footnote-2341634 -Node: cpio341755 -Node: Media346511 -Node: Device348441 -Node: Remote Tape Server353509 -Node: Common Problems and Solutions357239 -Node: Blocking357631 -Node: Format Variations364138 -Node: Blocking Factor365050 -Node: Many376704 -Node: Tape Positioning380498 -Node: mt382371 -Node: Using Multiple Tapes383926 -Node: Multi-Volume Archives385992 -Ref: tape-length387477 -Ref: change volume prompt387781 -Ref: volno-file388651 -Ref: info-script389203 -Ref: Multi-Volume Archives-Footnote-1394387 -Ref: Multi-Volume Archives-Footnote-2394497 -Node: Tape Files394564 -Node: Tarcat396048 -Node: label397093 -Ref: --test-label option398722 -Ref: label-Footnote-1401767 -Node: verify402002 -Node: Write Protection405302 -Node: Changes406132 -Node: Configuring Help Summary409717 -Node: Fixing Snapshot Files416220 -Node: Tar Internals418405 -Node: Standard418737 -Node: Extensions440938 -Node: Sparse Formats443498 -Node: Old GNU Format444788 -Node: PAX 0447199 -Node: PAX 1450326 -Node: Snapshot Files452060 -Node: Dumpdir456513 -Node: Genfile459759 -Node: Generate Mode460852 -Node: Status Mode465149 -Node: Exec Mode466948 -Node: Free Software Needs Free Documentation469184 -Node: Copying This Manual474155 -Node: GNU Free Documentation License474437 -Node: Index of Command Line Options496844 -Node: Index520649 +Node: Top1243 +Node: Introduction10510 +Node: Book Contents11297 +Node: Definitions13469 +Node: What tar Does15272 +Node: Naming tar Archives18038 +Node: Authors18758 +Node: Reports20571 +Node: Tutorial20931 +Node: assumptions21744 +Node: stylistic conventions24219 +Node: basic tar options24662 +Node: frequent operations28300 +Node: Two Frequent Options28952 +Node: file tutorial29583 +Node: verbose tutorial30944 +Ref: verbose member listing33158 +Node: help tutorial35911 +Node: create36265 +Node: prepare for examples37766 +Node: Creating the archive39534 +Node: create verbose42366 +Node: short create43187 +Node: create dir45940 +Node: list48647 +Ref: listing member and file names49921 +Node: list dir52202 +Node: extract53191 +Node: extracting archives54368 +Node: extracting files54858 +Ref: extracting files-Footnote-157505 +Node: extract dir57885 +Node: extracting untrusted archives60268 +Node: failing commands61147 +Node: going further62247 +Node: tar invocation62460 +Node: Synopsis63972 +Node: using tar options68941 +Ref: TAR_OPTIONS70526 +Node: Styles71543 +Node: Long Options73255 +Node: Short Options75427 +Ref: Short Options-Footnote-177235 +Node: Old Options77452 +Ref: Old Options-Footnote-180402 +Node: Mixing80572 +Ref: Mixing-Footnote-182938 +Node: All Options83058 +Node: Operation Summary83663 +Ref: --append83783 +Ref: --catenate83863 +Ref: --compare83934 +Ref: --concatenate84137 +Ref: --create84247 +Ref: --delete84315 +Ref: --diff84428 +Ref: --extract84484 +Ref: --get84586 +Ref: --list84644 +Ref: --update84712 +Node: Option Summary84922 +Ref: --absolute-names85077 +Ref: --after-date85255 +Ref: --anchored85307 +Ref: --atime-preserve85440 +Ref: --auto-compress87955 +Ref: --backup88182 +Ref: --block-number88373 +Ref: --blocking-factor88547 +Ref: --bzip288699 +Ref: --check-device88806 +Ref: --checkpoint89001 +Ref: --checkpoint-action89442 +Ref: --check-links90593 +Ref: --compress90870 +Ref: --uncompress90870 +Ref: --confirmation91074 +Ref: --delay-directory-restore91142 +Ref: --dereference91343 +Ref: --directory91528 +Ref: --exclude91781 +Ref: --exclude-from91900 +Ref: --exclude-caches92046 +Ref: --exclude-caches-under92240 +Ref: --exclude-caches-all92418 +Ref: --exclude-tag92547 +Ref: --exclude-tag-under92702 +Ref: --exclude-tag-all92870 +Ref: --exclude-vcs92984 +Ref: --file93139 +Ref: --files-from93339 +Ref: --force-local93542 +Ref: --format93733 +Ref: --group94403 +Ref: --gzip94751 +Ref: --gunzip94751 +Ref: --ungzip94751 +Ref: --hard-dereference94974 +Ref: --help95161 +Ref: --ignore-case95295 +Ref: --ignore-command-error95422 +Ref: --ignore-failed-read95533 +Ref: --ignore-zeros95663 +Ref: --incremental95808 +Ref: --index-file96073 +Ref: --info-script96158 +Ref: --new-volume-script96158 +Ref: --interactive96479 +Ref: --keep-newer-files96691 +Ref: --keep-old-files96833 +Ref: --label96964 +Ref: --listed-incremental97252 +Ref: --lzma97616 +Ref: --mode97821 +Ref: --mtime98112 +Ref: --multi-volume98553 +Ref: --newer98754 +Ref: --newer-mtime99032 +Ref: --no-anchored99256 +Ref: --no-auto-compress99393 +Ref: --no-check-device99544 +Ref: --no-delay-directory-restore99727 +Ref: --no-ignore-case99980 +Ref: --no-ignore-command-error100073 +Ref: --no-null100228 +Ref: --no-overwrite-dir100433 +Ref: --no-quote-chars100576 +Ref: --no-recursion100757 +Ref: --no-same-owner100862 +Ref: --no-same-permissions101045 +Ref: --no-unquote101247 +Ref: --no-wildcards101385 +Ref: --no-wildcards-match-slash101469 +Ref: --null101571 +Ref: --numeric-owner101799 +Ref: --occurrence102450 +Ref: --old-archive103017 +Ref: --one-file-system103066 +Ref: --overwrite103244 +Ref: --overwrite-dir103386 +Ref: --owner103531 +Ref: --pax-option103910 +Ref: --portability104209 +Ref: --posix104274 +Ref: --preserve104316 +Ref: --preserve-order104454 +Ref: --preserve-permissions104518 +Ref: --same-permissions104518 +Ref: --quote-chars104932 +Ref: --quoting-style105085 +Ref: --read-full-records105406 +Ref: --record-size105571 +Ref: --recursion105702 +Ref: --recursive-unlink105805 +Ref: --remove-files105972 +Ref: --restrict106118 +Ref: --rmt-command106306 +Ref: --rsh-command106447 +Ref: --same-order106569 +Ref: --same-owner106861 +Ref: --seek107238 +Ref: --show-defaults107495 +Ref: --show-omitted-dirs107863 +Ref: --show-transformed-names108017 +Ref: --show-stored-names108017 +Ref: --sparse108406 +Ref: --sparse-version108545 +Ref: --starting-file108769 +Ref: --strip-components108958 +Ref: --suffix109270 +Ref: --tape-length109405 +Ref: --test-label109560 +Ref: --to-command109712 +Ref: --to-stdout109871 +Ref: --totals110024 +Ref: --touch110255 +Ref: --transform110457 +Ref: --xform110457 +Ref: --unlink-first111068 +Ref: --unquote111236 +Ref: --use-compress-program111343 +Ref: --utc111511 +Ref: --verbose111604 +Ref: --verify111856 +Ref: --version111974 +Ref: --volno-file112146 +Ref: --wildcards112333 +Ref: --wildcards-match-slash112453 +Ref: Option Summary-Footnote-1112581 +Node: Short Option Summary112799 +Node: help115002 +Ref: help-Footnote-1118832 +Node: defaults119042 +Node: verbose120059 +Ref: totals122360 +Ref: Progress information123950 +Ref: show-omitted-dirs124929 +Ref: block-number125348 +Ref: verbose-Footnote-1126375 +Node: checkpoints126482 +Node: interactive131879 +Node: operations133962 +Node: Basic tar134221 +Ref: Basic tar-Footnote-1137325 +Node: Advanced tar137469 +Node: Operations138314 +Node: append140284 +Ref: append-Footnote-1143449 +Node: appending files143615 +Node: multiple145396 +Node: update148086 +Node: how to update149125 +Node: concatenate150908 +Ref: concatenate-Footnote-1154157 +Node: delete154295 +Node: compare156138 +Node: create options157628 +Node: override158086 +Node: Ignore Failed Read161524 +Node: extract options161744 +Node: Reading162640 +Node: read full records164203 +Node: Ignore Zeros164539 +Node: Writing165530 +Node: Dealing with Old Files166087 +Node: Overwrite Old Files168514 +Node: Keep Old Files169971 +Node: Keep Newer Files170481 +Node: Unlink First170771 +Node: Recursive Unlink171175 +Node: Data Modification Times171728 +Node: Setting Access Permissions172538 +Node: Directory Modification Times and Permissions173170 +Node: Writing to Standard Output176776 +Node: Writing to an External Program178311 +Node: remove files181048 +Node: Scarce181241 +Node: Starting File181489 +Node: Same Order182309 +Node: backup183145 +Node: Applications186369 +Node: looking ahead187882 +Node: Backups188708 +Node: Full Dumps190540 +Node: Incremental Dumps192346 +Ref: device numbers195482 +Ref: incremental-op199464 +Ref: Incremental Dumps-Footnote-1199838 +Ref: Incremental Dumps-Footnote-2199988 +Node: Backup Levels200475 +Node: Backup Parameters202862 +Node: General-Purpose Variables204043 +Ref: RSH207200 +Node: Magnetic Tape Control209079 +Node: User Hooks210416 +Node: backup-specs example211744 +Node: Scripted Backups212887 +Ref: Scripted Backups-Footnote-1215749 +Node: Scripted Restoration216133 +Node: Choosing218741 +Node: file219926 +Ref: remote-dev222625 +Ref: local and remote archives223017 +Node: Selecting Archive Members224047 +Ref: input name quoting224728 +Node: files226714 +Ref: files-Footnote-1229988 +Node: nul230146 +Node: exclude232545 +Node: problems with exclude237507 +Node: wildcards239552 +Node: controlling pattern-matching242136 +Ref: controlling pattern-matching-Footnote-1246126 +Node: quoting styles246342 +Ref: escape sequences246688 +Node: transform252823 +Ref: show-transformed-names254812 +Node: after261001 +Node: recurse264666 +Node: one267435 +Node: directory268931 +Node: absolute272004 +Ref: absolute-Footnote-1275138 +Node: Date input formats275489 +Node: General date syntax277805 +Node: Calendar date items280756 +Node: Time of day items282753 +Node: Time zone items284949 +Node: Day of week items286183 +Node: Relative items in date strings287172 +Node: Pure numbers in date strings289974 +Node: Seconds since the Epoch290955 +Node: Specifying time zone rules292576 +Node: Authors of get_date294940 +Node: Formats295692 +Node: Compression300380 +Node: gzip300672 +Ref: auto-compress303802 +Ref: gzip-Footnote-1307753 +Node: sparse307802 +Node: Attributes310856 +Node: Portability316827 +Node: Portable Names318313 +Node: dereference319018 +Node: hard links320419 +Ref: hard links-Footnote-1323377 +Node: old323433 +Node: ustar324617 +Node: gnu325208 +Node: posix326085 +Node: PAX keywords326566 +Node: Checksumming330894 +Node: Large or Negative Values332818 +Node: Other Tars334418 +Node: Split Recovery335554 +Node: Sparse Recovery339286 +Ref: extracting sparse v.0.x342919 +Ref: Sparse Recovery-Footnote-1346208 +Ref: Sparse Recovery-Footnote-2346231 +Node: cpio346352 +Node: Media351108 +Node: Device353038 +Node: Remote Tape Server358106 +Node: Common Problems and Solutions361836 +Node: Blocking362228 +Node: Format Variations368735 +Node: Blocking Factor369647 +Node: Many381301 +Node: Tape Positioning385095 +Node: mt386968 +Node: Using Multiple Tapes388523 +Node: Multi-Volume Archives390589 +Ref: tape-length392074 +Ref: change volume prompt392378 +Ref: volno-file393248 +Ref: info-script393800 +Ref: Multi-Volume Archives-Footnote-1398984 +Ref: Multi-Volume Archives-Footnote-2399094 +Node: Tape Files399161 +Node: Tarcat400644 +Node: label401689 +Ref: --test-label option403318 +Ref: label-Footnote-1406363 +Node: verify406598 +Node: Write Protection409898 +Node: Changes410728 +Node: Configuring Help Summary414313 +Node: Fixing Snapshot Files420814 +Node: Tar Internals422999 +Node: Standard423331 +Node: Extensions445532 +Node: Sparse Formats448092 +Node: Old GNU Format449382 +Node: PAX 0451793 +Node: PAX 1454920 +Node: Snapshot Files456654 +Node: Dumpdir461107 +Node: Genfile464353 +Node: Generate Mode465446 +Node: Status Mode469743 +Node: Exec Mode471542 +Node: Free Software Needs Free Documentation473778 +Node: Copying This Manual478749 +Node: GNU Free Documentation License479031 +Node: Index of Command Line Options501438 +Node: Index525681  End Tag Table diff --git a/doc/tar.info-1 b/doc/tar.info-1 index 67f9cf9..891413b 100644 --- a/doc/tar.info-1 +++ b/doc/tar.info-1 @@ -1,6 +1,6 @@ -This is tar.info, produced by makeinfo version 4.8.90 from tar.texi. +This is tar.info, produced by makeinfo version 4.13 from tar.texi. - This manual is for GNU `tar' (version 1.20, 14 April 2008), which +This manual is for GNU `tar' (version 1.21, 30 October 2008), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -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.20, 14 April 2008), which +This manual is for GNU `tar' (version 1.21, 30 October 2008), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -561,7 +561,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.20 +to create version 1.12. The book for versions from 1.14 up to 1.21 were edited by the current maintainer, Sergey Poznyakoff. For version 1.12, Daniel Hagerty contributed a great deal of @@ -2203,7 +2203,8 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera `--auto-compress' `-a' During a `--create' operation, enables automatic compressed format - recognition based on the archive suffix. *Note gzip::. + recognition based on the archive suffix. The effect of this + option is cancelled by `--no-auto-compress'. *Note gzip::. `--backup=BACKUP-TYPE' Rather than deleting files from the file system, `tar' will back @@ -2494,9 +2495,14 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera format. *Note Incremental Dumps::. `--lzma' +`-J' This option tells `tar' to read or write archives through `lzma'. *Note gzip::. +`--lzop' + This option tells `tar' to read or write archives through `lzop'. + *Note gzip::. + `--mode=PERMISSIONS' When adding files to an archive, `tar' will use PERMISSIONS for the archive members, rather than the permissions from the files. @@ -2537,6 +2543,10 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera An exclude pattern can match any subsequence of the name's components. *Note controlling pattern-matching::. +`--no-auto-compress' + Disables automatic compressed format recognition based on the + archive suffix. *Note --auto-compress::. *Note gzip::. + `--no-check-device' Do not check device numbers when creating a list of modified files for incremental archiving. *Note device numbers::, for a detailed @@ -2555,6 +2565,11 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera Print warnings about subprocesses that terminated with a nonzero exit code. *Note Writing to an External Program::. +`--no-null' + If the `--null' option was given previously, this option cancels + its effect, so that any following `--files-from' options will + expect their file lists to be newline-terminated. + `--no-overwrite-dir' Preserve metadata of existing directories when extracting files from an archive. *Note Overwrite Old Files::. @@ -2833,6 +2848,7 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera the archive. *Note Data Modification Times::. `--transform=SED-EXPR' +`--xform=SED-EXPR' Transform file or member names using `sed' replacement expression SED-EXPR. For example, @@ -2921,6 +2937,7 @@ Short Option Reference -C *note --directory::. -F *note --info-script::. -G *note --incremental::. +-J *note --lzma::. -K *note --starting-file::. -L *note --tape-length::. -M *note --multi-volume::. @@ -2949,7 +2966,7 @@ Short Option Reference -o When creating, *note --no-same-owner::, when extracting -- *note --portability::. - The later usage is deprecated. It is retained for + The latter usage is deprecated. It is retained for compatibility with the earlier versions of GNU `tar'. In future releases `-o' will be equivalent to `--no-same-owner' only. @@ -2975,7 +2992,7 @@ 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.20 + tar (GNU tar) 1.21 Copyright (C) 2008 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License . @@ -3322,13 +3339,13 @@ environment plus the following variables: The name of the archive `tar' is processing. `TAR_BLOCKING_FACTOR' - Current blocking factor (*note Blocking::. + Current blocking factor (*note Blocking::). `TAR_CHECKPOINT' - The checkpoint number. + Number of the checkpoint. `TAR_SUBCOMMAND' - A short option describing the operation `tar' is executing *Note + A short option describing the operation `tar' is executing. *Note Operations::, for a complete list of subcommand options. `TAR_FORMAT' @@ -3422,8 +3439,8 @@ complementary notes for these operations. can initialize an empty archive and later use `--append' (`-r') for adding all members. Some applications would not welcome making an exception in the way of adding the first archive member. - On the other hand, many people reported that it is dangerously - too easy for `tar' to destroy a magnetic tape with an empty + On the other hand, many people reported that it is dangerously too + easy for `tar' to destroy a magnetic tape with an empty archive(1). The two most common errors are: 1. Mistakingly using `create' instead of `extract', when the @@ -4660,9 +4677,9 @@ character device, or when it refers to a remote file. For the sake of simplicity and efficiency, backups are made by renaming old files prior to creation or extraction, and not by copying. -The original name is restored if the file creation fails. If a -failure occurs after a partial extraction of a file, both the backup -and the partially extracted file are kept. +The original name is restored if the file creation fails. If a failure +occurs after a partial extraction of a file, both the backup and the +partially extracted file are kept. `--backup[=METHOD]' Back up files that are about to be overwritten or removed. @@ -5535,10 +5552,10 @@ File: tar.info, Node: Choosing, Next: Date input formats, Prev: Backups, Up: _(This message will disappear, once this node revised.)_ Certain options to `tar' enable you to specify a name for your archive. -Other options let you decide which files to include or exclude from -the archive, based on when or whether files were modified, whether the -file names do or don't match specified patterns, or whether files are -in specified directories. +Other options let you decide which files to include or exclude from the +archive, based on when or whether files were modified, whether the file +names do or don't match specified patterns, or whether files are in +specified directories. This chapter discusses these options in detail. @@ -5830,6 +5847,9 @@ newline, so files whose names contain newlines can be archived using Only consider `NUL' terminated file names, instead of files that terminate in a newline. +`--no-null' + Undo the effect of any previous `--null' option. + The `--null' option is just like the one in GNU `xargs' and `cpio', and is useful with the `-print0' predicate of GNU `find'. In `tar', `--null' also disables special handling for file names that begin with @@ -5847,6 +5867,30 @@ create the archive `big.tgz'. The `--null' option to `tar' will cause $ find . -size +800 -print0 > long-files $ tar -c -v --null --files-from=long-files --file=big.tar + The `--no-null' option can be used if you need to read both +zero-terminated and newline-terminated files on the same command line. +For example, if `flist' is a newline-terminated file, then the +following command can be used to combine it with the above command: + + $ find . -size +800 -print0 | + tar -c -f big.tar --null -T - --no-null -T flist + + This example uses short options for typographic reasons, to avoid +very long lines. + + GNU `tar' is able to automatically detect null-terminated file +lists, so it is safe to use them even without the `--null' option. In +this case `tar' will print a warning and continue reading such a file +as if `--null' were actually given: + + $ find . -size +800 -print0 | tar -c -f big.tar -T - + tar: -: file name read contains nul character + + The null terminator, however, remains in effect only for this +particular file, any following `-T' options will assume newline +termination. Of course, the null autodetection applies to these +eventual surplus `-T' options as well. +  File: tar.info, Node: exclude, Next: wildcards, Prev: files, Up: Choosing @@ -5887,9 +5931,11 @@ difficult to catch using text editors. However, empty lines are OK. `--exclude-vcs' - Exclude files and directories used by some version control systems. + Exclude files and directories used by following version control + systems: `CVS', `RCS', `SCCS', `SVN', `Arch', `Bazaar', + `Mercurial', and `Darcs'. - As of version 1.20, the following files are excluded: + As of version 1.21, the following files are excluded: * `CVS/', and everything under it @@ -5915,6 +5961,20 @@ difficult to catch using text editors. * `=update' + * `.bzr' + + * `.bzrignore' + + * `.bzrtags' + + * `.hg' + + * `.hgignore' + + * `.hgrags' + + * `_darcs' + When creating an archive, the `--exclude-caches' option family causes `tar' to exclude all directories that contain a "cache directory tag". A cache directory tag is a short file with the well-known name @@ -6242,7 +6302,6 @@ caused by certain characters. This is called "name quoting". The characters in question are: * Non-printable control characters: - Character ASCII Character name --------------------------------------------------------------- \a 7 Audible bell @@ -6452,11 +6511,11 @@ File: tar.info, Node: transform, Next: after, Prev: quoting styles, Up: Choo `Tar' archives contain detailed information about files stored in them and full file names are part of that information. When storing file to -an archive, its file name is recorded in the archive along with the -actual file contents. When restoring from an archive, a file is -created on disk with exactly the same name as that stored in the -archive. In the majority of cases this is the desired behavior of a -file archiver. However, there are some cases when it is not. +an archive, its file name is recorded in it, along with the actual file +contents. When restoring from an archive, a file is created on disk +with exactly the same name as that stored in the archive. In the +majority of cases this is the desired behavior of a file archiver. +However, there are some cases when it is not. First of all, it is often unsafe to extract archive members with absolute file names or those that begin with a `../'. GNU `tar' takes @@ -6467,7 +6526,7 @@ option for handling them, which is described in *note absolute::. directory components, or with otherwise modified names. In other cases it is desirable to store files under differing names in the archive. - GNU `tar' provides two options for these needs. + GNU `tar' provides several options for these needs. `--strip-components=NUMBER' Strip given NUMBER of leading components from file names before @@ -6483,9 +6542,9 @@ working directory. To do so, you type: The option `--strip=2' instructs `tar' to strip the two leading components (`usr/' and `include/') off the file name. - If you add to the above invocation `--verbose' (`-v') option, you -will note that the verbose listing still contains the full file name, -with the two removed components still in place. This can be + If you add the `--verbose' (`-v') option to the invocation above, +you will note that the verbose listing still contains the full file +name, with the two removed components still in place. This can be inconvenient, so `tar' provides a special option for altering this behavior: @@ -6500,7 +6559,7 @@ For example: $ tar -xf usr.tar -v --strip=2 --show-transformed usr/include/stdlib.h stdlib.h - Notice that in both cases the file is `stdlib.h' extracted to the + Notice that in both cases the file `stdlib.h' is extracted to the current working directory, `--show-transformed-names' affects only the way its name is displayed. @@ -6519,6 +6578,7 @@ to make sure the command will produce the intended results. name, GNU `tar' provides a general-purpose transformation option: `--transform=EXPRESSION' +`--xform=EXPRESSION' Modify file names using supplied EXPRESSION. The EXPRESSION is a `sed'-like replace expression of the form: @@ -6529,6 +6589,16 @@ where REGEXP is a "regular expression", REPLACE is a replacement for each file name part that matches REGEXP. Both REGEXP and REPLACE are described in detail in *note The "s" Command: (sed)The "s" Command. + Any delimiter can be used in lieue of `/', the only requirement being +that it be used consistently throughout the expression. For example, +the following two expressions are equivalent: + + s/one/two/ + s,one,two, + + Changing delimiters is often useful when the REGEX contains slashes. +For example, it is more convenient to write `s,/,-,' than `s/\//-/'. + As in `sed', you can give several replace expressions, separated by a semicolon. @@ -6555,15 +6625,36 @@ a semicolon. replace all matches from the NUMBERth on. - Any delimiter can be used in lieue of `/', the only requirement being -that it be used consistently throughout the expression. For example, -the following two expressions are equivalent: + In addition, several "transformation scope" flags are supported, +that control to what files transformations apply. These are: - s/one/two/ - s,one,two, +`r' + Apply transformation to regular archive members. - Changing delimiters is often useful when the REGEX contains slashes. -For example, it is more convenient to write `s,/,-,' than `s/\//-/'. +`R' + Do not apply transformation to regular archive members. + +`s' + Apply transformation to symbolic link targets. + +`S' + Do not apply transformation to symbolic link targets. + +`h' + Apply transformation to hard link targets. + +`H' + Do not apply transformation to hard link targets. + + Default is `rsh', which means to apply tranformations to both archive +members and targets of symbolic and hard links. + + Default scope flags can also be changed using `flags=' statement in +the transform expression. The flags set this way remain in force until +next `flags=' statement or end of expression, whichever occurs first. +For example: + + --transform 'flags=S;s|^|/usr/local/|' Here are several examples of `--transform' usage: @@ -6576,14 +6667,45 @@ For example, it is more convenient to write `s,/,-,' than `s/\//-/'. $ tar --transform='s,/*[^/]*/[^/]*/,,' -x -f arch.tar - 3. Prepend `/prefix/' to each file name: + 3. Convert each file name to lower case: + + $ tar --transform 's/.*/\L&/' -x -f arch.tar + + 4. Prepend `/prefix/' to each file name: $ tar --transform 's,^,/prefix/,' -x -f arch.tar - 4. Convert each file name to lower case: + 5. Archive the `/lib' directory, prepending `/usr/local' to each + archive member: - $ tar --transform 's/.*/\L&/' -x -f arch.tar + $ tar --transform 's,^,/usr/local/,S' -c -f arch.tar /lib + + Notice the use of flags in the last example. The `/lib' directory +often contains many symbolic links to files within it. It may look, +for example, like this: + + $ ls -l + drwxr-xr-x root/root 0 2008-07-08 16:20 /lib/ + -rwxr-xr-x root/root 1250840 2008-05-25 07:44 /lib/libc-2.3.2.so + lrwxrwxrwx root/root 0 2008-06-24 17:12 /lib/libc.so.6 -> libc-2.3.2.so + ... + + Using the expression `s,^,/usr/local/,' would mean adding +`/usr/local' to both regular archive members and to link targets. In +this case, `/lib/libc.so.6' would become: + + /usr/local/lib/libc.so.6 -> /usr/local/libc-2.3.2.so + + This is definitely not desired. To avoid this, the `S' flag are +used, which excludes symbolic link targets from filename +transformations. The result is: + $ tar --transform 's,^,/usr/local/,S', -c -v -f arch.tar \ + --show-transformed /lib + drwxr-xr-x root/root 0 2008-07-08 16:20 /usr/local/lib/ + -rwxr-xr-x root/root 1250840 2008-05-25 07:44 /usr/local/lib/libc-2.3.2.so + lrwxrwxrwx root/root 0 2008-06-24 17:12 /usr/local/lib/libc.so.6 -> + libc-2.3.2.so Unlike `--strip-components', `--transform' can be used in any GNU `tar' operation mode. For example, the following command adds files to @@ -6948,9 +7070,7 @@ error to the sink. For example, under `sh': Another solution, both nicer and simpler, would be to change to the `/' directory first, and then avoid absolute notation. For example: - $ (cd / && tar -c -f archive.tar home) - # or: - $ tar -c -f archive.tar -C / home + $ tar -c -f archive.tar -C / home ---------- Footnotes ---------- @@ -7173,15 +7293,16 @@ 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. 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). The MINUTE part of -the time of day may not be elided when a time zone correction is used. -This is the best way to specify a time zone correction by fractional -parts of an hour. +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. @@ -7469,7 +7590,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.20 and Automake prior to 1.9. + 1.21 and Automake prior to 1.9. ustar Archive format defined by POSIX.1-1988 specification. It stores @@ -7548,176 +7669,3 @@ File: tar.info, Node: Compression, Next: Attributes, Up: Formats * gzip:: Creating and Reading Compressed Archives * sparse:: Archiving Sparse Files - -File: tar.info, Node: gzip, Next: sparse, Up: Compression - -8.1.1 Creating and Reading Compressed Archives ----------------------------------------------- - -GNU `tar' is able to create and read compressed archives. It supports -`gzip', `bzip2' and `lzma' compression programs. For backward -compatibility, it also supports `compress' command, although we -strongly recommend against using it, because it is by far less -effective than other compression programs(1). - - Creating a compressed archive is simple: you just specify a -"compression option" along with the usual archive creation commands. -The compression option is `-z' (`--gzip') to create a `gzip' compressed -archive, `-j' (`--bzip2') to create a `bzip2' compressed archive, -`--lzma' to create an LZMA compressed archive and `-Z' (`--compress') -to use `compress' program. For example: - - $ tar cfz archive.tar.gz . - - You can also let GNU `tar' select the compression program basing on -the suffix of the archive file name. This is done using -`--auto-compress' (`-a') command line option. For example, the -following invocation will use `bzip2' for compression: - - $ tar cfa archive.tar.bz2 . - -whereas the following one will use `lzma': - - $ tar cfa archive.tar.lzma . - - For a complete list of file name suffixes recognized by GNU `tar', -*note auto-compress::. - - Reading compressed archive is even simpler: you don't need to specify -any additional options as GNU `tar' recognizes its format -automatically. Thus, the following commands will list and extract the -archive created in previous example: - - # List the compressed archive - $ tar tf archive.tar.gz - # Extract the compressed archive - $ tar xf archive.tar.gz - - The only case when you have to specify a decompression option while -reading the archive is when reading from a pipe or from a tape drive -that does not support random access. However, in this case GNU `tar' -will indicate which option you should use. For example: - - $ cat archive.tar.gz | tar tf - - tar: Archive is compressed. Use -z option - tar: Error is not recoverable: exiting now - - If you see such diagnostics, just add the suggested option to the -invocation of GNU `tar': - - $ cat archive.tar.gz | tar tfz - - - Notice also, that there are several restrictions on operations on -compressed archives. First of all, compressed archives cannot be -modified, i.e., you cannot update (`--update' (`-u')) them or delete -(`--delete') members from them or add (`--append' (`-r')) members to -them. Likewise, you cannot append another `tar' archive to a -compressed archive using `--concatenate' (`-A')). Secondly, -multi-volume archives cannot be compressed. - - The following table summarizes compression options used by GNU `tar'. - -`--auto-compress' -`-a' - Select a compression program to use by the archive file name - suffix. The following suffixes are recognized: - - Suffix Compression program - -------------------------------------------------------------- - `.gz' `gzip' - `.tgz' `gzip' - `.taz' `gzip' - `.Z' `compress' - `.taZ' `compress' - `.bz2' `bzip2' - `.tz2' `bzip2' - `.tbz2' `bzip2' - `.tbz' `bzip2' - `.lzma' `lzma' - `.tlz' `lzma' - -`-z' -`--gzip' -`--ungzip' - Filter the archive through `gzip'. - - You can use `--gzip' and `--gunzip' on physical devices (tape - drives, etc.) and remote files as well as on normal files; data to - or from such devices or remote files is reblocked by another copy - of the `tar' program to enforce the specified (or default) record - size. The default compression parameters are used; if you need to - override them, set `GZIP' environment variable, e.g.: - - $ GZIP=--best tar cfz archive.tar.gz subdir - - Another way would be to avoid the `--gzip' (`--gunzip', - `--ungzip', `-z') option and run `gzip' explicitly: - - $ tar cf - subdir | gzip --best -c - > archive.tar.gz - - About corrupted compressed archives: `gzip''ed files have no - redundancy, for maximum compression. The adaptive nature of the - compression scheme means that the compression tables are implicitly - spread all over the archive. If you lose a few blocks, the dynamic - construction of the compression tables becomes unsynchronized, and - there is little chance that you could recover later in the archive. - - There are pending suggestions for having a per-volume or per-file - compression in GNU `tar'. This would allow for viewing the - contents without decompression, and for resynchronizing - decompression at every volume or file, in case of corrupted - archives. Doing so, we might lose some compressibility. But this - would have make recovering easier. So, there are pros and cons. - We'll see! - -`-j' -`--bzip2' - Filter the archive through `bzip2'. Otherwise like `--gzip'. - -`--lzma' - Filter the archive through `lzma'. Otherwise like `--gzip'. - -`-Z' -`--compress' -`--uncompress' - Filter the archive through `compress'. Otherwise like `--gzip'. - -`--use-compress-program=PROG' - Use external compression program PROG. Use this option if you - have a compression program that GNU `tar' does not support. There - are two requirements to which PROG should comply: - - First, when called without options, it should read data from - standard input, compress it and output it on standard output. - - Secondly, if called with `-d' argument, it should do exactly the - opposite, i.e., read the compressed data from the standard input - and produce uncompressed data on the standard output. - - The `--use-compress-program' option, in particular, lets you -implement your own filters, not necessarily dealing with -compression/decompression. For example, suppose you wish to implement -PGP encryption on top of compression, using `gpg' (*note gpg: -(gpg)Top.). The following script does that: - - #! /bin/sh - case $1 in - -d) gpg --decrypt - | gzip -d -c;; - '') gzip -c | gpg -s ;; - *) echo "Unknown option $1">&2; exit 1;; - esac - - Suppose you name it `gpgz' and save it somewhere in your `PATH'. -Then the following command will create a compressed archive signed with -your private key: - - $ tar -cf foo.tar.gpgz --use-compress=gpgz . - -Likewise, the following command will list its contents: - - $ tar -tf foo.tar.gpgz --use-compress=gpgz . - - ---------- Footnotes ---------- - - (1) It also had patent problems in the past. - diff --git a/doc/tar.info-2 b/doc/tar.info-2 index bd7e2b3..5720541 100644 --- a/doc/tar.info-2 +++ b/doc/tar.info-2 @@ -1,6 +1,6 @@ -This is tar.info, produced by makeinfo version 4.8.90 from tar.texi. +This is tar.info, produced by makeinfo version 4.13 from tar.texi. - This manual is for GNU `tar' (version 1.20, 14 April 2008), which +This manual is for GNU `tar' (version 1.21, 30 October 2008), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, @@ -28,6 +28,191 @@ START-INFO-DIR-ENTRY * tar: (tar)tar invocation. Invoking GNU `tar'. END-INFO-DIR-ENTRY + +File: tar.info, Node: gzip, Next: sparse, Up: Compression + +8.1.1 Creating and Reading Compressed Archives +---------------------------------------------- + +GNU `tar' is able to create and read compressed archives. It supports +`gzip', `bzip2', `lzma' and `lzop' compression programs. For backward +compatibility, it also supports `compress' command, although we +strongly recommend against using it, because it is by far less +effective than other compression programs(1). + + Creating a compressed archive is simple: you just specify a +"compression option" along with the usual archive creation commands. +The compression option is `-z' (`--gzip') to create a `gzip' compressed +archive, `-j' (`--bzip2') to create a `bzip2' compressed archive, `-J' +(`--lzma') to create an LZMA compressed archive, `--lzop' to create an +LSOP archive, and `-Z' (`--compress') to use `compress' program. For +example: + + $ tar cfz archive.tar.gz . + + You can also let GNU `tar' select the compression program basing on +the suffix of the archive file name. This is done using +`--auto-compress' (`-a') command line option. For example, the +following invocation will use `bzip2' for compression: + + $ tar cfa archive.tar.bz2 . + +whereas the following one will use `lzma': + + $ tar cfa archive.tar.lzma . + + For a complete list of file name suffixes recognized by GNU `tar', +*note auto-compress::. + + Reading compressed archive is even simpler: you don't need to specify +any additional options as GNU `tar' recognizes its format +automatically. Thus, the following commands will list and extract the +archive created in previous example: + + # List the compressed archive + $ tar tf archive.tar.gz + # Extract the compressed archive + $ tar xf archive.tar.gz + + The format recognition algorithm is based on "signatures", a special +byte sequences in the beginning of file, that are specific for certain +compression formats. If this approach fails, `tar' falls back to using +archive name suffix to determine its format (*Note auto-compress::, for +a list of recognized suffixes). + + The only case when you have to specify a decompression option while +reading the archive is when reading from a pipe or from a tape drive +that does not support random access. However, in this case GNU `tar' +will indicate which option you should use. For example: + + $ cat archive.tar.gz | tar tf - + tar: Archive is compressed. Use -z option + tar: Error is not recoverable: exiting now + + If you see such diagnostics, just add the suggested option to the +invocation of GNU `tar': + + $ cat archive.tar.gz | tar tfz - + + Notice also, that there are several restrictions on operations on +compressed archives. First of all, compressed archives cannot be +modified, i.e., you cannot update (`--update' (`-u')) them or delete +(`--delete') members from them or add (`--append' (`-r')) members to +them. Likewise, you cannot append another `tar' archive to a +compressed archive using `--concatenate' (`-A')). Secondly, +multi-volume archives cannot be compressed. + + The following table summarizes compression options used by GNU `tar'. + +`--auto-compress' +`-a' + Select a compression program to use by the archive file name + suffix. The following suffixes are recognized: + + Suffix Compression program + -------------------------------------------------------------- + `.gz' `gzip' + `.tgz' `gzip' + `.taz' `gzip' + `.Z' `compress' + `.taZ' `compress' + `.bz2' `bzip2' + `.tz2' `bzip2' + `.tbz2' `bzip2' + `.tbz' `bzip2' + `.lzma' `lzma' + `.tlz' `lzma' + `.lzo' `lzop' + +`-z' +`--gzip' +`--ungzip' + Filter the archive through `gzip'. + + You can use `--gzip' and `--gunzip' on physical devices (tape + drives, etc.) and remote files as well as on normal files; data to + or from such devices or remote files is reblocked by another copy + of the `tar' program to enforce the specified (or default) record + size. The default compression parameters are used; if you need to + override them, set `GZIP' environment variable, e.g.: + + $ GZIP=--best tar cfz archive.tar.gz subdir + + Another way would be to avoid the `--gzip' (`--gunzip', + `--ungzip', `-z') option and run `gzip' explicitly: + + $ tar cf - subdir | gzip --best -c - > archive.tar.gz + + About corrupted compressed archives: `gzip''ed files have no + redundancy, for maximum compression. The adaptive nature of the + compression scheme means that the compression tables are implicitly + spread all over the archive. If you lose a few blocks, the dynamic + construction of the compression tables becomes unsynchronized, and + there is little chance that you could recover later in the archive. + + There are pending suggestions for having a per-volume or per-file + compression in GNU `tar'. This would allow for viewing the + contents without decompression, and for resynchronizing + decompression at every volume or file, in case of corrupted + archives. Doing so, we might lose some compressibility. But this + would have make recovering easier. So, there are pros and cons. + We'll see! + +`-j' +`--bzip2' + Filter the archive through `bzip2'. Otherwise like `--gzip'. + +`--lzma' +`-J' + Filter the archive through `lzma'. Otherwise like `--gzip'. + +`--lzop' + Filter the archive through `lzop'. Otherwise like `--gzip'. + +`-Z' +`--compress' +`--uncompress' + Filter the archive through `compress'. Otherwise like `--gzip'. + +`--use-compress-program=PROG' + Use external compression program PROG. Use this option if you + have a compression program that GNU `tar' does not support. There + are two requirements to which PROG should comply: + + First, when called without options, it should read data from + standard input, compress it and output it on standard output. + + Secondly, if called with `-d' argument, it should do exactly the + opposite, i.e., read the compressed data from the standard input + and produce uncompressed data on the standard output. + + The `--use-compress-program' option, in particular, lets you +implement your own filters, not necessarily dealing with +compression/decompression. For example, suppose you wish to implement +PGP encryption on top of compression, using `gpg' (*note gpg: +(gpg)Top.). The following script does that: + + #! /bin/sh + case $1 in + -d) gpg --decrypt - | gzip -d -c;; + '') gzip -c | gpg -s ;; + *) echo "Unknown option $1">&2; exit 1;; + esac + + Suppose you name it `gpgz' and save it somewhere in your `PATH'. +Then the following command will create a compressed archive signed with +your private key: + + $ tar -cf foo.tar.gpgz --use-compress=gpgz . + +Likewise, the following command will list its contents: + + $ tar -tf foo.tar.gpgz --use-compress=gpgz . + + ---------- Footnotes ---------- + + (1) It also had patent problems in the past. +  File: tar.info, Node: sparse, Prev: gzip, Up: Compression @@ -1191,10 +1376,10 @@ File: tar.info, Node: Remote Tape Server, Next: Common Problems and Solutions, In order to access the tape drive on a remote machine, `tar' uses the remote tape server written at the University of California at Berkeley. -The remote tape server must be installed as `PREFIX/libexec/rmt' on -any machine whose tape drive you want to use. `tar' calls `rmt' by -running an `rsh' or `remsh' to the remote machine, optionally using a -different login name if one is supplied. +The remote tape server must be installed as `PREFIX/libexec/rmt' on any +machine whose tape drive you want to use. `tar' calls `rmt' by running +an `rsh' or `remsh' to the remote machine, optionally using a different +login name if one is supplied. A copy of the source for the remote tape server is provided. It is Copyright (C) 1983 by the Regents of the University of California, but @@ -1429,8 +1614,8 @@ of 512 bytes) is called the "blocking factor". The `--blocking-factor=512-SIZE' (`-b 512-SIZE') option specifies the blocking factor of an archive. The default blocking factor is typically 20 (i.e., 10240 bytes), but can be specified at installation. -To find out the blocking factor of an existing archive, use `tar ---list --file=ARCHIVE-NAME'. This may not work on some devices. +To find out the blocking factor of an existing archive, use `tar --list +--file=ARCHIVE-NAME'. This may not work on some devices. Records are separated by gaps, which waste space on the archive media. If you are archiving on magnetic tape, using a larger blocking @@ -2104,12 +2289,12 @@ number of the volume of the archive. (If you use the make sure the label on the tape matches the one you give. *Note label::. When `tar' writes an archive to tape, it creates a single tape file. -If multiple archives are written to the same tape, one after the -other, they each get written as separate tape files. When extracting, -it is necessary to position the tape at the right place before running -`tar'. To do this, use the `mt' command. For more information on the -`mt' command and on the organization of tapes into a sequence of tape -files, see *note mt::. +If multiple archives are written to the same tape, one after the other, +they each get written as separate tape files. When extracting, it is +necessary to position the tape at the right place before running `tar'. +To do this, use the `mt' command. For more information on the `mt' +command and on the organization of tapes into a sequence of tape files, +see *note mt::. People seem to often do: @@ -2344,7 +2529,7 @@ Appendix A Changes ****************** This appendix lists some important user-visible changes between version -GNU `tar' 1.20 and previous versions. An up-to-date version of this +GNU `tar' 1.21 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). @@ -2431,7 +2616,6 @@ order: a short option, eventually followed by a list of corresponding long option names, followed by a short description of the option. For example, here is an excerpt from the actual `tar --help' output: - Main operation mode: -A, --catenate, --concatenate append tar files to an archive @@ -2563,7 +2747,6 @@ Boolean assignment descriptive text preceding an option group. For example, in the following text: - Main operation mode: -A, --catenate, --concatenate append tar files to @@ -3134,9 +3317,9 @@ files in an archive. These are listed below. option. The original type of the file is not given here. The `size' field gives the maximum size of this piece of the file (assuming the volume does not end before the file is written out). - The `offset' field gives the offset from the beginning of the - file where this part of the file begins. Thus `size' plus - `offset' should equal the original size of the file. + The `offset' field gives the offset from the beginning of the file + where this part of the file begins. Thus `size' plus `offset' + should equal the original size of the file. `GNUTYPE_SPARSE' `'S'' @@ -3382,12 +3565,12 @@ 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.20 supports three snapshot file formats. The + GNU `tar' version 1.21 supports three snapshot file formats. The first format, called "format 0", is the one used by GNU `tar' versions up to 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 version 1.15.1. Starting from -version 1.16 and up to 1.20, the "format 2" is used. +version 1.16 and up to 1.21, the "format 2" is used. GNU `tar' is able to read all three formats, but will create snapshots only in format 2. @@ -3443,7 +3626,7 @@ snapshots only in format 2. 2. A snapshot file begins with a format identifier, as described for version 1, e.g.: - GNU tar-1.20-2 + GNU tar-1.21-2 This line is followed by newline. Rest of file consists of records, separated by null (ASCII 0) characters. Thus, in contrast @@ -4436,35 +4619,35 @@ Summary::. * append, summary: Operation Summary. (line 6) * atime-preserve: Attributes. (line 14) * atime-preserve, summary: Option Summary. (line 19) -* auto-compress: gzip. (line 69) +* auto-compress: gzip. (line 76) * auto-compress, summary: Option Summary. (line 65) * backup: backup. (line 41) -* backup, summary: Option Summary. (line 70) +* backup, summary: Option Summary. (line 71) * block-number: verbose. (line 115) -* block-number, summary: Option Summary. (line 75) +* block-number, summary: Option Summary. (line 76) * blocking-factor: Blocking Factor. (line 8) -* blocking-factor, summary: Option Summary. (line 81) -* bzip2: gzip. (line 122) -* bzip2, summary: Option Summary. (line 86) +* blocking-factor, summary: Option Summary. (line 82) +* bzip2: gzip. (line 130) +* bzip2, summary: Option Summary. (line 87) * catenate: concatenate. (line 6) * catenate, summary: Operation Summary. (line 10) * check-device, described: Incremental Dumps. (line 99) -* check-device, summary: Option Summary. (line 91) +* check-device, summary: Option Summary. (line 92) * check-links, described: hard links. (line 33) -* check-links, summary: Option Summary. (line 142) +* check-links, summary: Option Summary. (line 143) * checkpoint: checkpoints. (line 6) * checkpoint, defined: checkpoints. (line 13) -* checkpoint, summary: Option Summary. (line 96) +* checkpoint, summary: Option Summary. (line 97) * checkpoint-action: checkpoints. (line 6) * checkpoint-action, defined: checkpoints. (line 22) -* checkpoint-action, summary: Option Summary. (line 104) +* checkpoint-action, summary: Option Summary. (line 105) * compare: compare. (line 8) * compare, summary: Operation Summary. (line 14) -* compress: gzip. (line 129) -* compress, summary: Option Summary. (line 151) +* compress: gzip. (line 141) +* compress, summary: Option Summary. (line 152) * concatenate: concatenate. (line 6) * concatenate, summary: Operation Summary. (line 20) -* confirmation, summary: Option Summary. (line 158) +* confirmation, summary: Option Summary. (line 159) * create, additional options: create options. (line 6) * create, complementary notes: Basic tar. (line 11) * create, introduced: Creating the archive. @@ -4474,35 +4657,35 @@ Summary::. * create, using with --verify: verify. (line 24) * delay-directory-restore: Directory Modification Times and Permissions. (line 62) -* delay-directory-restore, summary: Option Summary. (line 161) +* delay-directory-restore, summary: Option Summary. (line 162) * delete: delete. (line 8) * delete, summary: Operation Summary. (line 29) * dereference: dereference. (line 6) -* dereference, summary: Option Summary. (line 166) +* dereference, summary: Option Summary. (line 167) * diff, summary: Operation Summary. (line 33) * directory: directory. (line 11) -* directory, summary: Option Summary. (line 172) +* directory, summary: Option Summary. (line 173) * directory, using in --files-from argument: files. (line 60) * exclude: exclude. (line 11) * exclude, potential problems with: problems with exclude. (line 6) -* exclude, summary: Option Summary. (line 179) -* exclude-caches: exclude. (line 80) -* exclude-caches, summary: Option Summary. (line 188) -* exclude-caches-all: exclude. (line 88) -* exclude-caches-all, summary: Option Summary. (line 201) -* exclude-caches-under: exclude. (line 84) -* exclude-caches-under, summary: Option Summary. (line 195) +* exclude, summary: Option Summary. (line 180) +* exclude-caches: exclude. (line 96) +* exclude-caches, summary: Option Summary. (line 189) +* exclude-caches-all: exclude. (line 104) +* exclude-caches-all, summary: Option Summary. (line 202) +* exclude-caches-under: exclude. (line 100) +* exclude-caches-under, summary: Option Summary. (line 196) * exclude-from: exclude. (line 22) -* exclude-from, summary: Option Summary. (line 183) -* exclude-tag: exclude. (line 97) -* exclude-tag, summary: Option Summary. (line 205) -* exclude-tag-all: exclude. (line 105) -* exclude-tag-all, summary: Option Summary. (line 213) -* exclude-tag-under: exclude. (line 101) -* exclude-tag-under, summary: Option Summary. (line 209) +* exclude-from, summary: Option Summary. (line 184) +* exclude-tag: exclude. (line 113) +* exclude-tag, summary: Option Summary. (line 206) +* exclude-tag-all: exclude. (line 121) +* exclude-tag-all, summary: Option Summary. (line 214) +* exclude-tag-under: exclude. (line 117) +* exclude-tag-under, summary: Option Summary. (line 210) * exclude-vcs: exclude. (line 39) -* exclude-vcs, summary: Option Summary. (line 217) +* exclude-vcs, summary: Option Summary. (line 218) * extract: extract. (line 8) * extract, additional options: extract options. (line 8) * extract, complementary notes: Basic tar. (line 48) @@ -4510,52 +4693,52 @@ Summary::. * extract, using with --listed-incremental: Incremental Dumps. (line 112) * file, short description: file. (line 17) -* file, summary: Option Summary. (line 223) +* file, summary: Option Summary. (line 224) * file, tutorial: file tutorial. (line 6) * files-from: files. (line 14) -* files-from, summary: Option Summary. (line 229) +* files-from, summary: Option Summary. (line 230) * force-local, short description: Device. (line 70) -* force-local, summary: Option Summary. (line 235) -* format, summary: Option Summary. (line 240) +* force-local, summary: Option Summary. (line 236) +* format, summary: Option Summary. (line 241) * get, summary: Operation Summary. (line 42) * group: override. (line 73) -* group, summary: Option Summary. (line 265) -* gunzip, summary: Option Summary. (line 273) -* gzip: gzip. (line 88) -* gzip, summary: Option Summary. (line 273) +* group, summary: Option Summary. (line 266) +* gunzip, summary: Option Summary. (line 274) +* gzip: gzip. (line 96) +* gzip, summary: Option Summary. (line 274) * hard-dereference, described: hard links. (line 61) -* hard-dereference, summary: Option Summary. (line 281) +* hard-dereference, summary: Option Summary. (line 282) * help: help tutorial. (line 6) * help, introduction: help. (line 26) -* help, summary: Option Summary. (line 287) +* help, summary: Option Summary. (line 288) * ignore-case: controlling pattern-matching. (line 86) -* ignore-case, summary: Option Summary. (line 292) +* ignore-case, summary: Option Summary. (line 293) * ignore-command-error: Writing to an External Program. (line 82) -* ignore-command-error, summary: Option Summary. (line 296) +* ignore-command-error, summary: Option Summary. (line 297) * ignore-failed-read: Ignore Failed Read. (line 7) -* ignore-failed-read, summary: Option Summary. (line 300) +* ignore-failed-read, summary: Option Summary. (line 301) * ignore-zeros: Ignore Zeros. (line 6) * ignore-zeros, short description: Blocking Factor. (line 156) -* ignore-zeros, summary: Option Summary. (line 304) -* incremental, summary: Option Summary. (line 309) +* ignore-zeros, summary: Option Summary. (line 305) +* incremental, summary: Option Summary. (line 310) * incremental, using with --list: Incremental Dumps. (line 177) -* index-file, summary: Option Summary. (line 316) +* index-file, summary: Option Summary. (line 317) * info-script: Multi-Volume Archives. (line 80) * info-script, short description: Device. (line 104) -* info-script, summary: Option Summary. (line 319) +* info-script, summary: Option Summary. (line 320) * interactive: interactive. (line 14) -* interactive, summary: Option Summary. (line 327) +* interactive, summary: Option Summary. (line 328) * keep-newer-files: Keep Newer Files. (line 6) -* keep-newer-files, summary: Option Summary. (line 334) +* keep-newer-files, summary: Option Summary. (line 335) * keep-old-files: Keep Old Files. (line 6) * keep-old-files, introduced: Dealing with Old Files. (line 16) -* keep-old-files, summary: Option Summary. (line 338) +* keep-old-files, summary: Option Summary. (line 339) * label: label. (line 8) -* label, summary: Option Summary. (line 343) +* label, summary: Option Summary. (line 344) * list: list. (line 6) * list, summary: Operation Summary. (line 46) * list, using with --incremental: Incremental Dumps. (line 177) @@ -4563,189 +4746,195 @@ Summary::. * list, using with --verbose: list. (line 30) * list, using with file name arguments: list. (line 68) * listed-incremental: Incremental Dumps. (line 14) -* listed-incremental, summary: Option Summary. (line 350) +* listed-incremental, summary: Option Summary. (line 351) * listed-incremental, using with --extract: Incremental Dumps. (line 112) * listed-incremental, using with --list: Incremental Dumps. (line 177) -* lzma: gzip. (line 126) -* lzma, summary: Option Summary. (line 358) +* lzma: gzip. (line 134) +* lzma, summary: Option Summary. (line 359) +* lzop: gzip. (line 138) * mode: override. (line 14) -* mode, summary: Option Summary. (line 362) +* mode, summary: Option Summary. (line 368) * mtime: override. (line 29) -* mtime, summary: Option Summary. (line 368) +* mtime, summary: Option Summary. (line 374) * multi-volume: Multi-Volume Archives. (line 6) * multi-volume, short description: Device. (line 88) -* multi-volume, summary: Option Summary. (line 377) +* multi-volume, summary: Option Summary. (line 383) * new-volume-script: Multi-Volume Archives. (line 80) * new-volume-script, short description: Device. (line 104) -* new-volume-script, summary: Option Summary. (line 319) +* new-volume-script, summary: Option Summary. (line 320) * newer: after. (line 26) -* newer, summary: Option Summary. (line 385) +* newer, summary: Option Summary. (line 391) * newer-mtime: after. (line 37) -* newer-mtime, summary: Option Summary. (line 393) +* newer-mtime, summary: Option Summary. (line 399) * no-anchored: controlling pattern-matching. (line 79) -* no-anchored, summary: Option Summary. (line 398) +* no-anchored, summary: Option Summary. (line 404) +* no-auto-compress, summary: Option Summary. (line 408) * no-check-device, described: Incremental Dumps. (line 95) -* no-check-device, summary: Option Summary. (line 402) +* no-check-device, summary: Option Summary. (line 412) * no-delay-directory-restore: Directory Modification Times and Permissions. (line 68) -* no-delay-directory-restore, summary: Option Summary. (line 407) +* no-delay-directory-restore, summary: Option Summary. (line 417) * no-ignore-case: controlling pattern-matching. (line 86) -* no-ignore-case, summary: Option Summary. (line 413) +* no-ignore-case, summary: Option Summary. (line 423) * no-ignore-command-error: Writing to an External Program. (line 87) -* no-ignore-command-error, summary: Option Summary. (line 416) -* no-overwrite-dir, summary: Option Summary. (line 420) -* no-quote-chars, summary: Option Summary. (line 424) +* no-ignore-command-error, summary: Option Summary. (line 426) +* no-null, described: nul. (line 15) +* no-null, summary: Option Summary. (line 430) +* no-overwrite-dir, summary: Option Summary. (line 435) +* no-quote-chars, summary: Option Summary. (line 439) * no-recursion: recurse. (line 13) -* no-recursion, summary: Option Summary. (line 429) +* no-recursion, summary: Option Summary. (line 444) * no-same-owner: Attributes. (line 67) -* no-same-owner, summary: Option Summary. (line 433) -* no-same-permissions, summary: Option Summary. (line 439) +* no-same-owner, summary: Option Summary. (line 448) +* no-same-permissions, summary: Option Summary. (line 454) * no-unquote: Selecting Archive Members. (line 42) -* no-unquote, summary: Option Summary. (line 444) +* no-unquote, summary: Option Summary. (line 459) * no-wildcards: controlling pattern-matching. (line 41) -* no-wildcards, summary: Option Summary. (line 448) +* no-wildcards, summary: Option Summary. (line 463) * no-wildcards-match-slash: controlling pattern-matching. (line 92) -* no-wildcards-match-slash, summary: Option Summary. (line 451) -* null: nul. (line 11) -* null, summary: Option Summary. (line 454) +* no-wildcards-match-slash, summary: Option Summary. (line 466) +* null, described: nul. (line 11) +* null, summary: Option Summary. (line 469) * numeric-owner: Attributes. (line 73) -* numeric-owner, summary: Option Summary. (line 460) -* occurrence, summary: Option Summary. (line 477) -* old-archive, summary: Option Summary. (line 491) +* numeric-owner, summary: Option Summary. (line 475) +* occurrence, summary: Option Summary. (line 492) +* old-archive, summary: Option Summary. (line 506) * one-file-system: one. (line 16) -* one-file-system, summary: Option Summary. (line 494) +* one-file-system, summary: Option Summary. (line 509) * overwrite: Overwrite Old Files. (line 6) * overwrite, introduced: Dealing with Old Files. (line 22) -* overwrite, summary: Option Summary. (line 499) +* overwrite, summary: Option Summary. (line 514) * overwrite-dir: Overwrite Old Files. (line 28) * overwrite-dir, introduced: Dealing with Old Files. (line 6) -* overwrite-dir, summary: Option Summary. (line 503) +* overwrite-dir, summary: Option Summary. (line 518) * owner: override. (line 57) -* owner, summary: Option Summary. (line 507) +* owner, summary: Option Summary. (line 522) * pax-option: PAX keywords. (line 6) -* pax-option, summary: Option Summary. (line 516) -* portability, summary: Option Summary. (line 522) -* posix, summary: Option Summary. (line 526) +* pax-option, summary: Option Summary. (line 531) +* portability, summary: Option Summary. (line 537) +* posix, summary: Option Summary. (line 541) * preserve: Attributes. (line 126) -* preserve, summary: Option Summary. (line 529) +* preserve, summary: Option Summary. (line 544) * preserve-order: Same Order. (line 6) -* preserve-order, summary: Option Summary. (line 533) +* preserve-order, summary: Option Summary. (line 548) * preserve-permissions: Setting Access Permissions. (line 10) * preserve-permissions, short description: Attributes. (line 113) -* preserve-permissions, summary: Option Summary. (line 536) -* quote-chars, summary: Option Summary. (line 546) -* quoting-style: quoting styles. (line 39) -* quoting-style, summary: Option Summary. (line 550) +* preserve-permissions, summary: Option Summary. (line 551) +* quote-chars, summary: Option Summary. (line 561) +* quoting-style: quoting styles. (line 38) +* quoting-style, summary: Option Summary. (line 565) * read-full-records <1>: read full records. (line 6) * read-full-records: Reading. (line 8) * read-full-records, short description: Blocking Factor. (line 172) -* read-full-records, summary: Option Summary. (line 557) -* record-size, summary: Option Summary. (line 562) +* read-full-records, summary: Option Summary. (line 572) +* record-size, summary: Option Summary. (line 577) * recursion: recurse. (line 24) -* recursion, summary: Option Summary. (line 566) +* recursion, summary: Option Summary. (line 581) * recursive-unlink: Recursive Unlink. (line 6) -* recursive-unlink, summary: Option Summary. (line 570) +* recursive-unlink, summary: Option Summary. (line 585) * remove-files: remove files. (line 6) -* remove-files, summary: Option Summary. (line 575) -* restrict, summary: Option Summary. (line 579) -* rmt-command, summary: Option Summary. (line 584) +* remove-files, summary: Option Summary. (line 590) +* restrict, summary: Option Summary. (line 594) +* rmt-command, summary: Option Summary. (line 599) * rsh-command: Device. (line 73) -* rsh-command, summary: Option Summary. (line 588) +* rsh-command, summary: Option Summary. (line 603) * same-order: Same Order. (line 6) -* same-order, summary: Option Summary. (line 592) +* same-order, summary: Option Summary. (line 607) * same-owner: Attributes. (line 48) -* same-owner, summary: Option Summary. (line 600) +* same-owner, summary: Option Summary. (line 615) * same-permissions: Setting Access Permissions. (line 10) * same-permissions, short description: Attributes. (line 113) -* same-permissions, summary: Option Summary. (line 536) -* seek, summary: Option Summary. (line 609) +* same-permissions, summary: Option Summary. (line 551) +* seek, summary: Option Summary. (line 624) * show-defaults: defaults. (line 6) -* show-defaults, summary: Option Summary. (line 616) +* show-defaults, summary: Option Summary. (line 631) * show-omitted-dirs: verbose. (line 107) -* show-omitted-dirs, summary: Option Summary. (line 625) +* show-omitted-dirs, summary: Option Summary. (line 640) * show-stored-names: list. (line 60) -* show-stored-names, summary: Option Summary. (line 629) +* show-stored-names, summary: Option Summary. (line 644) * show-transformed-names: transform. (line 45) -* show-transformed-names, summary: Option Summary. (line 629) +* show-transformed-names, summary: Option Summary. (line 644) * sparse: sparse. (line 22) -* sparse, summary: Option Summary. (line 637) +* sparse, summary: Option Summary. (line 652) * sparse-version: sparse. (line 57) -* sparse-version, summary: Option Summary. (line 642) +* sparse-version, summary: Option Summary. (line 657) * starting-file: Starting File. (line 6) -* starting-file, summary: Option Summary. (line 647) +* starting-file, summary: Option Summary. (line 662) * strip-components: transform. (line 25) -* strip-components, summary: Option Summary. (line 653) +* strip-components, summary: Option Summary. (line 668) * suffix: backup. (line 68) -* suffix, summary: Option Summary. (line 662) +* suffix, summary: Option Summary. (line 677) * tape-length: Multi-Volume Archives. (line 33) * tape-length, short description: Device. (line 96) -* tape-length, summary: Option Summary. (line 668) +* tape-length, summary: Option Summary. (line 683) * test-label: label. (line 37) -* test-label, summary: Option Summary. (line 673) +* test-label, summary: Option Summary. (line 688) * to-command: Writing to an External Program. (line 9) -* to-command, summary: Option Summary. (line 677) +* to-command, summary: Option Summary. (line 692) * to-stdout: Writing to Standard Output. (line 14) -* to-stdout, summary: Option Summary. (line 681) +* to-stdout, summary: Option Summary. (line 696) * totals: verbose. (line 46) -* totals, summary: Option Summary. (line 686) +* totals, summary: Option Summary. (line 701) * touch <1>: Attributes. (line 37) * touch: Data Modification Times. (line 15) -* touch, summary: Option Summary. (line 691) +* touch, summary: Option Summary. (line 706) * transform: transform. (line 74) -* transform, summary: Option Summary. (line 697) -* uncompress: gzip. (line 129) -* uncompress, summary: Option Summary. (line 151) -* ungzip: gzip. (line 88) -* ungzip, summary: Option Summary. (line 273) +* transform, summary: Option Summary. (line 712) +* uncompress: gzip. (line 141) +* uncompress, summary: Option Summary. (line 152) +* ungzip: gzip. (line 96) +* ungzip, summary: Option Summary. (line 274) * unlink-first: Unlink First. (line 6) * unlink-first, introduced: Dealing with Old Files. (line 42) -* unlink-first, summary: Option Summary. (line 716) +* unlink-first, summary: Option Summary. (line 732) * unquote: Selecting Archive Members. (line 39) -* unquote, summary: Option Summary. (line 722) +* unquote, summary: Option Summary. (line 738) * update: update. (line 8) * update, summary: Operation Summary. (line 50) * usage: help. (line 53) -* use-compress-program: gzip. (line 134) -* use-compress-program, summary: Option Summary. (line 726) -* utc, summary: Option Summary. (line 730) +* use-compress-program: gzip. (line 146) +* use-compress-program, summary: Option Summary. (line 742) +* utc, summary: Option Summary. (line 746) * verbose: verbose. (line 18) * verbose, introduced: verbose tutorial. (line 6) -* verbose, summary: Option Summary. (line 734) +* verbose, summary: Option Summary. (line 750) * 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 741) +* verify, summary: Option Summary. (line 757) * verify, using with --create: verify. (line 24) * version: help. (line 6) -* version, summary: Option Summary. (line 746) +* version, summary: Option Summary. (line 762) * volno-file: Multi-Volume Archives. (line 71) -* volno-file, summary: Option Summary. (line 751) +* volno-file, summary: Option Summary. (line 767) * wildcards: controlling pattern-matching. (line 38) -* wildcards, summary: Option Summary. (line 756) +* wildcards, summary: Option Summary. (line 772) * wildcards-match-slash: controlling pattern-matching. (line 92) -* wildcards-match-slash, summary: Option Summary. (line 760) +* wildcards-match-slash, summary: Option Summary. (line 776) +* xform: transform. (line 74) +* xform, summary: Option Summary. (line 712)  File: tar.info, Node: Index, Prev: Index of Command Line Options, Up: Top @@ -4767,6 +4956,7 @@ Appendix I Index (line 23) * am in date strings: Time of day items. (line 22) * Appending files to an Archive: appending files. (line 8) +* Arch, excluding files: exclude. (line 39) * archive: Definitions. (line 6) * Archive creation: file. (line 36) * archive member: Definitions. (line 15) @@ -4776,7 +4966,7 @@ Appendix I Index * Archiving Directories: create dir. (line 6) * archiving files: Top. (line 24) * ARGP_HELP_FMT, environment variable: Configuring Help Summary. - (line 22) + (line 21) * authors of get_date: Authors of get_date. (line 6) * Avoiding recursion in directories: recurse. (line 8) * backup options: backup. (line 6) @@ -4788,6 +4978,7 @@ Appendix I Index * BACKUP_HOUR: General-Purpose Variables. (line 11) * backups: backup. (line 41) +* Bazaar, excluding files: exclude. (line 39) * beginning of time, for POSIX: Seconds since the Epoch. (line 13) * bell, checkpoint action: checkpoints. (line 65) @@ -4802,6 +4993,7 @@ Appendix I Index * Blocks per record: Blocking Factor. (line 6) * bug reports: Reports. (line 6) * Bytes per record: Blocking Factor. (line 6) +* bzip2: gzip. (line 6) * calendar date item: Calendar date items. (line 6) * case, ignored in dates: General date syntax. (line 64) * cat vs concatenate: concatenate. (line 63) @@ -4810,13 +5002,15 @@ Appendix I Index * checkpoints, defined: checkpoints. (line 6) * Choosing an archive file: file. (line 8) * comments, in dates: General date syntax. (line 64) +* compress: gzip. (line 6) * Compressed archives: gzip. (line 6) * concatenate vs cat: concatenate. (line 63) * Concatenating Archives: concatenate. (line 6) -* corrupted archives <1>: gzip. (line 107) +* corrupted archives <1>: gzip. (line 115) * corrupted archives: Full Dumps. (line 8) * Creation of the archive: create. (line 8) * CVS, excluding files: exclude. (line 39) +* Darcs, excluding files: exclude. (line 39) * DAT blocking: Blocking Factor. (line 204) * Data Modification time, excluding files by: after. (line 8) * Data modification times of extracted files: Data Modification Times. @@ -4842,7 +5036,7 @@ Appendix I Index * displacement of dates: Relative items in date strings. (line 6) * doc-opt-col: Configuring Help Summary. - (line 95) + (line 94) * dot, checkpoint action: checkpoints. (line 80) * Double-checking a write operation: verify. (line 6) * DUMP_BEGIN: User Hooks. (line 32) @@ -4851,9 +5045,9 @@ Appendix I Index (line 102) * dumps, full: Full Dumps. (line 8) * dup-args: Configuring Help Summary. - (line 52) + (line 51) * dup-args-note: Configuring Help Summary. - (line 69) + (line 68) * echo, checkpoint action: checkpoints. (line 25) * Eggert, Paul: Authors of get_date. (line 6) * End-of-archive blocks, ignoring: Ignore Zeros. (line 6) @@ -4865,9 +5059,9 @@ Appendix I Index * Error message, block number of: verbose. (line 125) * Exabyte blocking: Blocking Factor. (line 204) * exclude: exclude. (line 14) -* exclude-caches: exclude. (line 68) +* exclude-caches: exclude. (line 84) * exclude-from: exclude. (line 27) -* exclude-tag: exclude. (line 91) +* exclude-tag: exclude. (line 107) * Excluding characters from a character class: wildcards. (line 34) * Excluding file by age: after. (line 8) * Excluding files by file system: exclude. (line 8) @@ -4928,11 +5122,12 @@ Appendix I Index * GNU.sparse.offset, extended header variable: PAX 0. (line 18) * GNU.sparse.realsize, extended header variable: PAX 1. (line 24) * GNU.sparse.size, extended header variable: PAX 0. (line 11) -* gnupg, using with tar: gzip. (line 146) -* gpg, using with tar: gzip. (line 146) +* gnupg, using with tar: gzip. (line 158) +* gpg, using with tar: gzip. (line 158) +* gzip: gzip. (line 6) * hard links, dereferencing: hard links. (line 8) * header-col: Configuring Help Summary. - (line 141) + (line 140) * hook: User Hooks. (line 13) * hour in date strings: Relative items in date strings. (line 15) @@ -4957,11 +5152,14 @@ Appendix I Index * Lists of file names: files. (line 6) * Local and remote archives: file. (line 73) * long-opt-col: Configuring Help Summary. - (line 87) + (line 86) +* lzma: gzip. (line 6) +* lzop: gzip. (line 6) * MacKenzie, David: Authors of get_date. (line 6) * member: Definitions. (line 15) * member name: Definitions. (line 15) * Members, replacing with other members: append. (line 49) +* Mercurial, excluding files: exclude. (line 39) * Meyering, Jim: Authors of get_date. (line 6) * Middle of the archive, starting in the: Starting File. (line 11) * midnight in date strings: Time of day items. (line 22) @@ -5014,7 +5212,7 @@ Appendix I Index * Old style archives: old. (line 6) * Old style format: old. (line 6) * opt-doc-col: Configuring Help Summary. - (line 127) + (line 126) * option syntax, traditional: Old Options. (line 60) * Options when reading archives: Reading. (line 6) * Options, archive format specifying: Format Variations. (line 6) @@ -5053,7 +5251,7 @@ Appendix I Index * Retrieving files from an archive: extract. (line 8) * return status: Synopsis. (line 67) * rmargin: Configuring Help Summary. - (line 160) + (line 158) * rmt: Remote Tape Server. (line 6) * RSH: General-Purpose Variables. (line 72) @@ -5063,7 +5261,7 @@ Appendix I Index * Salz, Rich: Authors of get_date. (line 6) * SCCS, excluding files: exclude. (line 39) * short-opt-col: Configuring Help Summary. - (line 79) + (line 78) * simple backup method: backup. (line 64) * SIMPLE_BACKUP_SUFFIX: backup. (line 68) * sleep, checkpoint action: checkpoints. (line 90) @@ -5188,8 +5386,8 @@ Appendix I Index * unpacking: Definitions. (line 22) * Updating an archive: update. (line 8) * usage-indent: Configuring Help Summary. - (line 156) -* Using encrypted archives: gzip. (line 146) + (line 154) +* Using encrypted archives: gzip. (line 158) * ustar archive format: ustar. (line 6) * uuencode: Applications. (line 8) * v7 archive format: old. (line 6) diff --git a/doc/tar.texi b/doc/tar.texi index 5898792..cb8bd19 100644 --- a/doc/tar.texi +++ b/doc/tar.texi @@ -2407,7 +2407,8 @@ superuser privileges and can be a pain to manage. @itemx -a During a @option{--create} operation, enables automatic compressed -format recognition based on the archive suffix. @xref{gzip}. +format recognition based on the archive suffix. The effect of this +option is cancelled by @option{--no-auto-compress}. @xref{gzip}. @opsummary{backup} @item --backup=@var{backup-type} @@ -2785,10 +2786,16 @@ incremental format. @xref{Incremental Dumps}. @opsummary{lzma} @item --lzma +@itemx -J This option tells @command{tar} to read or write archives through @command{lzma}. @xref{gzip}. +@item --lzop + +This option tells @command{tar} to read or write archives through +@command{lzop}. @xref{gzip}. + @opsummary{mode} @item --mode=@var{permissions} @@ -2843,6 +2850,12 @@ changed). @xref{after}. An exclude pattern can match any subsequence of the name's components. @xref{controlling pattern-matching}. +@opsummary{no-auto-compress} +@item --no-auto-compress + +Disables automatic compressed format recognition based on the archive +suffix. @xref{--auto-compress}. @xref{gzip}. + @opsummary{no-check-device} @item --no-check-device Do not check device numbers when creating a list of modified files @@ -2867,6 +2880,13 @@ Use case-sensitive matching. Print warnings about subprocesses that terminated with a nonzero exit code. @xref{Writing to an External Program}. +@opsummary{no-null} +@item --no-null + +If the @option{--null} option was given previously, this option +cancels its effect, so that any following @option{--files-from} +options will expect their file lists to be newline-terminated. + @opsummary{no-overwrite-dir} @item --no-overwrite-dir @@ -3246,8 +3266,9 @@ rather than the data modification time stored in the archive. @xref{Data Modification Times}. @opsummary{transform} +@opsummary{xform} @item --transform=@var{sed-expr} - +@itemx --xform=@var{sed-expr} Transform file or member names using @command{sed} replacement expression @var{sed-expr}. For example, @@ -3358,6 +3379,8 @@ them with the equivalent long option. @item -G @tab @ref{--incremental}. +@item -J @tab @ref{--lzma}. + @item -K @tab @ref{--starting-file}. @item -L @tab @ref{--tape-length}. @@ -3411,7 +3434,7 @@ them with the equivalent long option. @item -o @tab When creating, @ref{--no-same-owner}, when extracting --- @ref{--portability}. -The later usage is deprecated. It is retained for compatibility with +The latter usage is deprecated. It is retained for compatibility with the earlier versions of @GNUTAR{}. In future releases @option{-o} will be equivalent to @option{--no-same-owner} only. @@ -3886,15 +3909,15 @@ The name of the archive @command{tar} is processing. @vrindex TAR_BLOCKING_FACTOR, checkpoint script environment @item TAR_BLOCKING_FACTOR -Current blocking factor (@pxref{Blocking}. +Current blocking factor (@pxref{Blocking}). @vrindex TAR_CHECKPOINT, checkpoint script environment @item TAR_CHECKPOINT -The checkpoint number. +Number of the checkpoint. @vrindex TAR_SUBCOMMAND, checkpoint script environment @item TAR_SUBCOMMAND -A short option describing the operation @command{tar} is executing +A short option describing the operation @command{tar} is executing. @xref{Operations}, for a complete list of subcommand options. @vrindex TAR_FORMAT, checkpoint script environment @@ -6732,10 +6755,14 @@ files whose names contain newlines can be archived using @option{--files-from}. @table @option -@opindex null +@xopindex{null, described} @item --null Only consider @code{NUL} terminated file names, instead of files that terminate in a newline. + +@xopindex{no-null, described} +@item --no-null +Undo the effect of any previous @option{--null} option. @end table The @option{--null} option is just like the one in @acronym{GNU} @@ -6759,7 +6786,37 @@ $ @kbd{find . -size +800 -print0 > long-files} $ @kbd{tar -c -v --null --files-from=long-files --file=big.tar} @end smallexample -@FIXME{say anything else here to conclude the section?} +The @option{--no-null} option can be used if you need to read both +zero-terminated and newline-terminated files on the same command line. +For example, if @file{flist} is a newline-terminated file, then the +following command can be used to combine it with the above command: + +@smallexample +@group +$ @kbd{find . -size +800 -print0 | + tar -c -f big.tar --null -T - --no-null -T flist} +@end group +@end smallexample + +This example uses short options for typographic reasons, to avoid +very long lines. + +@GNUTAR is able to automatically detect null-terminated file lists, so +it is safe to use them even without the @option{--null} option. In +this case @command{tar} will print a warning and continue reading such +a file as if @option{--null} were actually given: + +@smallexample +@group +$ @kbd{find . -size +800 -print0 | tar -c -f big.tar -T -} +tar: -: file name read contains nul character +@end group +@end smallexample + +The null terminator, however, remains in effect only for this +particular file, any following @option{-T} options will assume +newline termination. Of course, the null autodetection applies +to these eventual surplus @option{-T} options as well. @node exclude @section Excluding Some Files @@ -6816,10 +6873,16 @@ However, empty lines are OK. @cindex CVS, excluding files @cindex SVN, excluding files @cindex git, excluding files +@cindex Bazaar, excluding files +@cindex Arch, excluding files +@cindex Mercurial, excluding files +@cindex Darcs, excluding files @table @option @opindex exclude-vcs @item --exclude-vcs -Exclude files and directories used by some version control systems. +Exclude files and directories used by following version control +systems: @samp{CVS}, @samp{RCS}, @samp{SCCS}, @samp{SVN}, @samp{Arch}, +@samp{Bazaar}, @samp{Mercurial}, and @samp{Darcs}. @end table As of version @value{VERSION}, the following files are excluded: @@ -6837,6 +6900,13 @@ As of version @value{VERSION}, the following files are excluded: @item @file{=RELEASE-ID} @item @file{=meta-update} @item @file{=update} +@item @file{.bzr} +@item @file{.bzrignore} +@item @file{.bzrtags} +@item @file{.hg} +@item @file{.hgignore} +@item @file{.hgrags} +@item @file{_darcs} @end itemize @findex exclude-caches @@ -7484,7 +7554,7 @@ characters that are quoted by default in the selected quoting style. @command{Tar} archives contain detailed information about files stored in them and full file names are part of that information. When -storing file to an archive, its file name is recorded in the archive +storing file to an archive, its file name is recorded in it, along with the actual file contents. When restoring from an archive, a file is created on disk with exactly the same name as that stored in the archive. In the majority of cases this is the desired behavior @@ -7501,7 +7571,7 @@ directory components, or with otherwise modified names. In other cases it is desirable to store files under differing names in the archive. -@GNUTAR{} provides two options for these needs. +@GNUTAR{} provides several options for these needs. @table @option @opindex strip-components @@ -7523,8 +7593,8 @@ The option @option{--strip=2} instructs @command{tar} to strip the two leading components (@file{usr/} and @file{include/}) off the file name. -If you add to the above invocation @option{--verbose} (@option{-v}) -option, you will note that the verbose listing still contains the +If you add the @option{--verbose} (@option{-v}) option to the invocation +above, you will note that the verbose listing still contains the full file name, with the two removed components still in place. This can be inconvenient, so @command{tar} provides a special option for altering this behavior: @@ -7549,7 +7619,7 @@ stdlib.h @end group @end smallexample -Notice that in both cases the file is @file{stdlib.h} extracted to the +Notice that in both cases the file @file{stdlib.h} is extracted to the current working directory, @option{--show-transformed-names} affects only the way its name is displayed. @@ -7575,7 +7645,9 @@ In case you need to apply more complex modifications to the file name, @table @option @opindex transform +@opindex xform @item --transform=@var{expression} +@itemx --xform=@var{expression} Modify file names using supplied @var{expression}. @end table @@ -7593,6 +7665,21 @@ replacement for each file name part that matches @var{regexp}. Both @var{regexp} and @var{replace} are described in detail in @ref{The "s" Command, The "s" Command, The `s' Command, sed, GNU sed}. +Any delimiter can be used in lieue of @samp{/}, the only requirement being +that it be used consistently throughout the expression. For example, +the following two expressions are equivalent: + +@smallexample +@group +s/one/two/ +s,one,two, +@end group +@end smallexample + +Changing delimiters is often useful when the @var{regex} contains +slashes. For example, it is more convenient to write @code{s,/,-,} than +@code{s/\//-/}. + As in @command{sed}, you can give several replace expressions, separated by a semicolon. @@ -7614,7 +7701,7 @@ sed, GNU sed}). @item @var{number} Only replace the @var{number}th match of the @var{regexp}. -Note: the @var{posix} standard does not specify what should happen +Note: the @acronym{POSIX} standard does not specify what should happen when you mix the @samp{g} and @var{number} modifiers. @GNUTAR{} follows the GNU @command{sed} implementation in this regard, so the interaction is defined to be: ignore matches before the @@ -7623,21 +7710,41 @@ the interaction is defined to be: ignore matches before the @end table -Any delimiter can be used in lieue of @samp{/}, the only requirement being -that it be used consistently throughout the expression. For example, -the following two expressions are equivalent: +In addition, several @dfn{transformation scope} flags are supported, +that control to what files transformations apply. These are: + +@table @samp +@item r +Apply transformation to regular archive members. + +@item R +Do not apply transformation to regular archive members. + +@item s +Apply transformation to symbolic link targets. + +@item S +Do not apply transformation to symbolic link targets. + +@item h +Apply transformation to hard link targets. + +@item H +Do not apply transformation to hard link targets. +@end table + +Default is @samp{rsh}, which means to apply tranformations to both archive +members and targets of symbolic and hard links. + +Default scope flags can also be changed using @samp{flags=} statement +in the transform expression. The flags set this way remain in force +until next @samp{flags=} statement or end of expression, whichever +occurs first. For example: @smallexample -@group -s/one/two/ -s,one,two, -@end group + --transform 'flags=S;s|^|/usr/local/|' @end smallexample -Changing delimiters is often useful when the @var{regex} contains -slashes. For example, it is more convenient to write @code{s,/,-,} than -@code{s/\//-/}. - Here are several examples of @option{--transform} usage: @enumerate @@ -7654,20 +7761,59 @@ $ @kbd{tar --transform='s,usr/,usr/local/,' -x -f arch.tar} $ @kbd{tar --transform='s,/*[^/]*/[^/]*/,,' -x -f arch.tar} @end smallexample +@item Convert each file name to lower case: + +@smallexample +$ @kbd{tar --transform 's/.*/\L&/' -x -f arch.tar} +@end smallexample + @item Prepend @file{/prefix/} to each file name: @smallexample $ @kbd{tar --transform 's,^,/prefix/,' -x -f arch.tar} @end smallexample -@item Convert each file name to lower case: +@item Archive the @file{/lib} directory, prepending @samp{/usr/local} +to each archive member: @smallexample -$ @kbd{tar --transform 's/.*/\L&/' -x -f arch.tar} +$ @kbd{tar --transform 's,^,/usr/local/,S' -c -f arch.tar /lib} @end smallexample - @end enumerate +Notice the use of flags in the last example. The @file{/lib} +directory often contains many symbolic links to files within it. +It may look, for example, like this: + +@smallexample +$ @kbd{ls -l} +drwxr-xr-x root/root 0 2008-07-08 16:20 /lib/ +-rwxr-xr-x root/root 1250840 2008-05-25 07:44 /lib/libc-2.3.2.so +lrwxrwxrwx root/root 0 2008-06-24 17:12 /lib/libc.so.6 -> libc-2.3.2.so +... +@end smallexample + +Using the expression @samp{s,^,/usr/local/,} would mean adding +@samp{/usr/local} to both regular archive members and to link +targets. In this case, @file{/lib/libc.so.6} would become: + +@smallexample + /usr/local/lib/libc.so.6 -> /usr/local/libc-2.3.2.so +@end smallexample + +This is definitely not desired. To avoid this, the @samp{S} flag +are used, which excludes symbolic link targets from filename +transformations. The result is: + +@smallexample +$ @kbd{tar --transform 's,^,/usr/local/,S', -c -v -f arch.tar \ + --show-transformed /lib} +drwxr-xr-x root/root 0 2008-07-08 16:20 /usr/local/lib/ +-rwxr-xr-x root/root 1250840 2008-05-25 07:44 /usr/local/lib/libc-2.3.2.so +lrwxrwxrwx root/root 0 2008-06-24 17:12 /usr/local/lib/libc.so.6 -> +libc-2.3.2.so +@end smallexample + Unlike @option{--strip-components}, @option{--transform} can be used in any @GNUTAR{} operation mode. For example, the following command adds files to the archive while replacing the leading @file{usr/} @@ -8112,9 +8258,7 @@ the @file{/} directory first, and then avoid absolute notation. For example: @smallexample -$ @kbd{(cd / && tar -c -f archive.tar home)} -# @i{or}: -$ @kbd{tar -c -f archive.tar -C / home} +$ @kbd{tar -c -f archive.tar -C / home} @end smallexample @include getdate.texi @@ -8244,8 +8388,13 @@ switch to @samp{posix}. @cindex Compressed archives @cindex Storing archives in compressed format +@cindex gzip +@cindex bzip2 +@cindex lzma +@cindex lzop +@cindex compress @GNUTAR{} is able to create and read compressed archives. It supports -@command{gzip}, @command{bzip2} and @command{lzma} compression +@command{gzip}, @command{bzip2}, @command{lzma} and @command{lzop} compression programs. For backward compatibility, it also supports @command{compress} command, although we strongly recommend against using it, because it is by far less effective than other compression @@ -8256,7 +8405,8 @@ Creating a compressed archive is simple: you just specify a commands. The compression option is @option{-z} (@option{--gzip}) to create a @command{gzip} compressed archive, @option{-j} (@option{--bzip2}) to create a @command{bzip2} compressed archive, -@option{--lzma} to create an @asis{LZMA} compressed archive and +@option{-J} (@option{--lzma}) to create an @asis{LZMA} compressed +archive, @option{--lzop} to create an @asis{LSOP} archive, and @option{-Z} (@option{--compress}) to use @command{compress} program. For example: @@ -8296,6 +8446,12 @@ $ @kbd{tar tf archive.tar.gz} $ @kbd{tar xf archive.tar.gz} @end smallexample +The format recognition algorithm is based on @dfn{signatures}, a +special byte sequences in the beginning of file, that are specific for +certain compression formats. If this approach fails, @command{tar} +falls back to using archive name suffix to determine its format +(@xref{auto-compress}, for a list of recognized suffixes). + The only case when you have to specify a decompression option while reading the archive is when reading from a pipe or from a tape drive that does not support random access. However, in this case @GNUTAR{} @@ -8331,7 +8487,7 @@ The following table summarizes compression options used by @GNUTAR{}. @item --auto-compress @itemx -a Select a compression program to use by the archive file name -suffix. The following suffixes are recognized: +suffix. The following suffixes are recognized: @multitable @columnfractions 0.3 0.6 @headitem Suffix @tab Compression program @@ -8346,6 +8502,7 @@ suffix. The following suffixes are recognized: @item @samp{.tbz} @tab @command{bzip2} @item @samp{.lzma} @tab @command{lzma} @item @samp{.tlz} @tab @command{lzma} +@item @samp{.lzo} @tab @command{lzop} @end multitable @opindex gzip @@ -8396,8 +8553,14 @@ Filter the archive through @code{bzip2}. Otherwise like @option{--gzip}. @opindex lzma @item --lzma +@itemx -J Filter the archive through @command{lzma}. Otherwise like @option{--gzip}. +@opindex lzop +@item --lzop +Filter the archive through @command{lzop}. Otherwise like +@option{--gzip}. + @opindex compress @opindex uncompress @item -Z diff --git a/doc/version.texi b/doc/version.texi index 580b586..eb2c3a0 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 14 April 2008 -@set UPDATED-MONTH April 2008 -@set EDITION 1.20 -@set VERSION 1.20 +@set UPDATED 30 October 2008 +@set UPDATED-MONTH October 2008 +@set EDITION 1.21 +@set VERSION 1.21 diff --git a/lib/Makefile.in b/lib/Makefile.in index 1dbc635..41352ce 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -42,7 +42,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=libtar --source-base=.#bootmp/lib --m4-base=.#bootmp/m4 --doc-base=.#bootmp/doc --aux-dir=.#bootmp/build-aux --avoid=lock --avoid=size_max --no-libtool --macro-prefix=gl alloca argmatch argp backupfile closeout configmake dirname error exclude exitfail fileblocks fnmatch-gnu fseeko ftruncate full-write getdate getline getopt getpagesize gettext gettime hash human inttostr inttypes lchown localcharset memset mkdtemp modechange obstack quote quotearg rmdir rpmatch safe-read save-cwd savedir setenv snprintf stat-time stdbool stdint stpcpy strdup strerror strtol strtoul timespec unlinkdir unlocked-io utime utimens version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libtar --source-base=.#bootmp/lib --m4-base=.#bootmp/m4 --doc-base=.#bootmp/doc --tests-base=.#bootmp/tests --aux-dir=.#bootmp/build-aux --avoid=lock --avoid=size_max --no-libtool --macro-prefix=gl alloca argmatch argp backupfile closeout configmake dirname error exclude exitfail fileblocks fnmatch-gnu fseeko ftruncate full-write getdate getline getopt getpagesize gettext gettime hash human inttostr inttypes lchown localcharset memset mkdtemp modechange obstack quote quotearg rmdir rpmatch safe-read save-cwd savedir setenv snprintf stat-time stdbool stdint stpcpy strdup strerror strtol strtoul timespec unlinkdir unlocked-io utime utimens version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax @@ -75,19 +75,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.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/closeout.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/eoverflow.m4 \ + $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fcntl-safer.m4 \ - $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fileblocks.m4 \ - $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ - $(top_srcdir)/m4/ftruncate.m4 \ + $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ + $(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl_h.m4 \ + $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/float_h.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ + $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getdelim.m4 \ @@ -112,41 +113,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.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/setenv.m4 \ - $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/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/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/sys_stat_h.m4 \ - $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ - $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/sleep.m4 \ + $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ + $(top_srcdir)/m4/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/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/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac @@ -165,9 +168,9 @@ am_libtar_a_OBJECTS = argp-ba.$(OBJEXT) argp-eexst.$(OBJEXT) \ argp-fmtstream.$(OBJEXT) argp-fs-xinl.$(OBJEXT) \ argp-help.$(OBJEXT) argp-parse.$(OBJEXT) argp-pin.$(OBJEXT) \ argp-pv.$(OBJEXT) argp-pvh.$(OBJEXT) argp-xinl.$(OBJEXT) \ - full-write.$(OBJEXT) getdate.$(OBJEXT) localcharset.$(OBJEXT) \ - malloca.$(OBJEXT) mbchar.$(OBJEXT) mbscasecmp.$(OBJEXT) \ - openat-die.$(OBJEXT) strnlen1.$(OBJEXT) \ + c-ctype.$(OBJEXT) full-write.$(OBJEXT) getdate.$(OBJEXT) \ + localcharset.$(OBJEXT) malloca.$(OBJEXT) mbchar.$(OBJEXT) \ + mbscasecmp.$(OBJEXT) openat-die.$(OBJEXT) strnlen1.$(OBJEXT) \ uniwidth/width.$(OBJEXT) version-etc.$(OBJEXT) \ version-etc-fsf.$(OBJEXT) xalloc-die.$(OBJEXT) \ xstrndup.$(OBJEXT) xstrtoumax.$(OBJEXT) paxerror.$(OBJEXT) \ @@ -186,9 +189,19 @@ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) YLWRAP = $(top_srcdir)/build-aux/ylwrap SOURCES = $(libtar_a_SOURCES) $(EXTRA_libtar_a_SOURCES) DIST_SOURCES = $(libtar_a_SOURCES) $(EXTRA_libtar_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 HEADERS = $(noinst_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -226,7 +239,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EOVERFLOW = @EOVERFLOW@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FCNTL_H = @FCNTL_H@ FLOAT_H = @FLOAT_H@ @@ -236,30 +255,47 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_DIRFD = @GNULIB_DIRFD@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ GNULIB_FTELLO = @GNULIB_FTELLO@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FWRITE = @GNULIB_FWRITE@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ @@ -280,15 +316,26 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ GNULIB_STPCPY = @GNULIB_STPCPY@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ @@ -304,25 +351,35 @@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ATOLL = @HAVE_ATOLL@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ +HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ +HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ @@ -336,22 +393,31 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DUP2 = @HAVE_DUP2@ +HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ +HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ +HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_IO_H = @HAVE_IO_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_R = @HAVE_RANDOM_R@ +HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_RPMATCH = @HAVE_RPMATCH@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -367,10 +433,15 @@ HAVE_STRNDUP = @HAVE_STRNDUP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOLL = @HAVE_STRTOLL@ +HAVE_STRTOULL = @HAVE_STRTOULL@ +HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ +HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ @@ -412,6 +483,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -437,13 +509,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ +PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ REPLACE_CHOWN = @REPLACE_CHOWN@ +REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ +REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -456,18 +531,25 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ +REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRPTIME = @REPLACE_STRPTIME@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ @@ -480,6 +562,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -495,6 +578,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ @@ -561,6 +645,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects +SUBDIRS = noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h stdopen.h noinst_LIBRARIES = libtar.a noinst_LTLIBRARIES = @@ -576,33 +661,35 @@ noinst_LTLIBRARIES = #AM_CPPFLAGS += -I$(top_builddir)/intl EXTRA_DIST = alloca.c alloca.in.h argmatch.c argmatch.h backupfile.c \ backupfile.h canonicalize-lgpl.c canonicalize.h chdir-long.c \ - chdir-long.h chown.c fchown-stub.c close-stream.c \ - close-stream.h closeout.c closeout.h dirfd.c dirfd.h \ - basename.c dirname.c dirname.h stripslash.c dup2.c error.c \ - error.h exclude.c exclude.h exitfail.c exitfail.h dirent.in.h \ - fchdir.c fcntl.in.h creat-safer.c fcntl--.h fcntl-safer.h \ - open-safer.c fileblocks.c float.in.h fnmatch.c fnmatch.in.h \ - fnmatch_loop.c fpending.c fpending.h fseeko.c ftruncate.c \ - getcwd.c getdate.c getdate.h getdelim.c getline.c getopt.c \ - getopt.in.h getopt1.c getopt_int.h getpagesize.c \ + chdir-long.h chown.c fchown-stub.c close.c close-stream.c \ + close-stream.h closeout.c closeout.h dirent.in.h dirfd.c \ + basename.c dirname.c dirname.h stripslash.c dup2.c errno.in.h \ + error.c error.h exclude.c exclude.h exitfail.c exitfail.h \ + fchdir.c fclose.c fcntl.in.h creat-safer.c fcntl--.h \ + fcntl-safer.h open-safer.c fileblocks.c float.in.h fnmatch.c \ + fnmatch.in.h fnmatch_loop.c fpending.c fpending.h fseeko.c \ + stdio-impl.h ftruncate.c getcwd.c getdate.c getdate.h \ + getdelim.c getline.c getopt.c getopt.in.h getopt1.c \ + getopt_int.h getpagesize.c \ $(top_srcdir)/build-aux/config.rpath gettime.c gettimeofday.c \ hash.c hash.h $(top_srcdir)/build-aux/config.rpath human.c \ human.h intprops.h imaxtostr.c inttostr.c inttostr.h \ offtostr.c uinttostr.c umaxtostr.c inttypes.in.h lchown.c \ $(top_srcdir)/build-aux/link-warning.h config.charset \ - ref-add.sin ref-del.sin lseek.c lstat.c lstat.h malloc.c \ - malloc.c malloca.h malloca.valgrind mbchar.h memchr.c \ - mempcpy.c memrchr.c memset.c mkdtemp.c mktime.c modechange.c \ - modechange.h obstack.c obstack.h at-func.c fchmodat.c \ + ref-add.sin ref-del.sin lseek.c lstat.c malloc.c malloc.c \ + malloca.h malloca.valgrind mbchar.h memchr.c mempcpy.c \ + memrchr.c memset.c mkdtemp.c mktime.c modechange.c \ + modechange.h obstack.c obstack.h open.c at-func.c fchmodat.c \ fchownat.c fstatat.c mkdirat.c openat-priv.h openat-proc.c \ openat.c openat.h pathmax.h quote.c quote.h quotearg.c \ - quotearg.h readlink.c realloc.c regcomp.c regex.c regex.h \ - regex_internal.c regex_internal.h regexec.c rmdir.c rpmatch.c \ - safe-read.c safe-read.h safe-write.c safe-write.h same-inode.h \ - save-cwd.c save-cwd.h savedir.c savedir.h setenv.c sleep.c \ - snprintf.c stat-macros.h stat-time.h stdarg.in.h stdbool.in.h \ - stdint.in.h stdio.in.h stdlib.in.h stpcpy.c strcasecmp.c \ - strncasecmp.c strchrnul.c strdup.c streq.h strerror.c \ + quotearg.h rawmemchr.c rawmemchr.valgrind readlink.c realloc.c \ + regcomp.c regex.c regex.h regex_internal.c regex_internal.h \ + regexec.c rmdir.c rpmatch.c safe-read.c safe-read.h \ + safe-write.c safe-write.h same-inode.h save-cwd.c save-cwd.h \ + savedir.c savedir.h setenv.c sleep.c snprintf.c stat-macros.h \ + stat-time.h stdarg.in.h stdbool.in.h stdint.in.h stdio-write.c \ + stdio.in.h stdlib.in.h stpcpy.c strcasecmp.c strncasecmp.c \ + strchrnul.c strchrnul.valgrind strdup.c streq.h strerror.c \ string.in.h strings.in.h strndup.c strnlen.c strtoimax.c \ strtol.c strtoll.c strtoul.c strtoull.c strtoumax.c \ sys_stat.in.h sys_time.in.h sysexits.in.h tempname.c \ @@ -613,22 +700,24 @@ EXTRA_DIST = alloca.c alloca.in.h argmatch.c argmatch.h backupfile.c \ utimens.c utimens.h asnprintf.c float+.h printf-args.c \ printf-args.h printf-parse.c printf-parse.h vasnprintf.c \ vasnprintf.h vsnprintf.c wchar.in.h wctype.in.h wcwidth.c \ - xalloc.h xmalloc.c xgetcwd.c xgetcwd.h xstrtol-error.c \ + write.c xalloc.h xmalloc.c xgetcwd.c xgetcwd.h xstrtol-error.c \ xstrtol.c xstrtol.h xstrtoul.c -BUILT_SOURCES = $(ALLOCA_H) configmake.h $(DIRENT_H) $(FCNTL_H) \ - $(FLOAT_H) $(FNMATCH_H) getdate.c $(GETOPT_H) $(INTTYPES_H) \ - $(STDARG_H) $(STDBOOL_H) $(STDINT_H) stdio.h stdlib.h string.h \ - strings.h $(SYS_STAT_H) $(SYS_TIME_H) $(SYSEXITS_H) time.h \ - unistd.h $(WCHAR_H) $(WCTYPE_H) rmt-command.h +BUILT_SOURCES = $(ALLOCA_H) configmake.h $(DIRENT_H) $(ERRNO_H) \ + $(FCNTL_H) $(FLOAT_H) $(FNMATCH_H) getdate.c $(GETOPT_H) \ + $(INTTYPES_H) $(STDARG_H) $(STDBOOL_H) $(STDINT_H) stdio.h \ + stdlib.h string.h strings.h $(SYS_STAT_H) $(SYS_TIME_H) \ + $(SYSEXITS_H) time.h unistd.h $(WCHAR_H) $(WCTYPE_H) \ + rmt-command.h SUFFIXES = .sed .sin MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t dirent.h \ - dirent.h-t fcntl.h fcntl.h-t float.h float.h-t fnmatch.h \ - fnmatch.h-t getopt.h getopt.h-t inttypes.h inttypes.h-t \ - stdarg.h stdarg.h-t stdbool.h stdbool.h-t stdint.h stdint.h-t \ - stdio.h stdio.h-t stdlib.h stdlib.h-t string.h string.h-t \ - strings.h strings.h-t sys/stat.h sys/stat.h-t sys/time.h \ - sys/time.h-t sysexits.h sysexits.h-t time.h time.h-t unistd.h \ - unistd.h-t wchar.h wchar.h-t wctype.h wctype.h-t + dirent.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h \ + float.h-t fnmatch.h fnmatch.h-t getopt.h getopt.h-t inttypes.h \ + inttypes.h-t stdarg.h stdarg.h-t stdbool.h stdbool.h-t \ + stdint.h stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t \ + string.h string.h-t strings.h strings.h-t sys/stat.h \ + sys/stat.h-t sys/time.h sys/time.h-t sysexits.h sysexits.h-t \ + time.h time.h-t unistd.h unistd.h-t wchar.h wchar.h-t wctype.h \ + wctype.h-t MOSTLYCLEANDIRS = sys CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ ref-del.sed rmt-command.h rmt-command.h-t @@ -638,42 +727,44 @@ AM_CPPFLAGS = libtar_a_SOURCES = argp.h argp-ba.c argp-eexst.c argp-fmtstream.c \ argp-fmtstream.h argp-fs-xinl.c argp-help.c argp-namefrob.h \ argp-parse.c argp-pin.c argp-pv.c argp-pvh.c argp-xinl.c \ - full-write.h full-write.c getdate.y gettext.h localcharset.h \ - localcharset.c malloca.c mbchar.c mbscasecmp.c mbuiter.h \ - openat-die.c strnlen1.h strnlen1.c uniwidth/width.c verify.h \ - version-etc.h version-etc.c version-etc-fsf.c xalloc-die.c \ - xsize.h xstrndup.h xstrndup.c xstrtoumax.c paxerror.c \ - paxexit.c paxlib.h paxnames.c prepargs.c prepargs.h rtapelib.c \ - rmt.h stdopen.c stdopen.h system.h system-ioctl.h + c-ctype.h c-ctype.c full-write.h full-write.c getdate.y \ + gettext.h localcharset.h localcharset.c malloca.c mbchar.c \ + mbscasecmp.c mbuiter.h openat-die.c strnlen1.h strnlen1.c \ + uniwidth/width.c verify.h version-etc.h version-etc.c \ + version-etc-fsf.c xalloc-die.c xsize.h xstrndup.h xstrndup.c \ + xstrtoumax.c paxerror.c paxexit.c paxlib.h paxnames.c \ + prepargs.c prepargs.h rtapelib.c rmt.h stdopen.c stdopen.h \ + system.h system-ioctl.h libtar_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@ $(LIBOBJS) libtar_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@ $(LIBOBJS) EXTRA_libtar_a_SOURCES = alloca.c argmatch.c backupfile.c \ - canonicalize-lgpl.c chdir-long.c chown.c fchown-stub.c \ + canonicalize-lgpl.c chdir-long.c chown.c fchown-stub.c close.c \ close-stream.c closeout.c dirfd.c basename.c dirname.c \ stripslash.c dup2.c error.c exclude.c exitfail.c fchdir.c \ - creat-safer.c open-safer.c fileblocks.c fnmatch.c \ + fclose.c creat-safer.c open-safer.c fileblocks.c fnmatch.c \ fnmatch_loop.c fpending.c fseeko.c ftruncate.c getcwd.c \ getdelim.c getline.c getopt.c getopt1.c getpagesize.c \ gettime.c gettimeofday.c hash.c human.c imaxtostr.c inttostr.c \ offtostr.c uinttostr.c umaxtostr.c lchown.c lseek.c lstat.c \ malloc.c malloc.c memchr.c mempcpy.c memrchr.c memset.c \ - mkdtemp.c mktime.c modechange.c obstack.c at-func.c fchmodat.c \ - fchownat.c fstatat.c mkdirat.c openat-proc.c openat.c quote.c \ - quotearg.c readlink.c realloc.c regcomp.c regex.c \ - regex_internal.c regexec.c rmdir.c rpmatch.c safe-read.c \ - safe-write.c save-cwd.c savedir.c setenv.c sleep.c snprintf.c \ - stpcpy.c strcasecmp.c strncasecmp.c strchrnul.c strdup.c \ - strerror.c strndup.c strnlen.c strtoimax.c strtol.c strtoll.c \ - strtoul.c strtoull.c strtoumax.c tempname.c time_r.c \ - dup-safer.c fd-safer.c pipe-safer.c unlinkdir.c unsetenv.c \ - utime.c utimens.c asnprintf.c printf-args.c printf-parse.c \ - vasnprintf.c vsnprintf.c wcwidth.c xmalloc.c xgetcwd.c \ + mkdtemp.c mktime.c modechange.c obstack.c open.c at-func.c \ + fchmodat.c fchownat.c fstatat.c mkdirat.c openat-proc.c \ + openat.c quote.c quotearg.c rawmemchr.c readlink.c realloc.c \ + regcomp.c regex.c regex_internal.c regexec.c rmdir.c rpmatch.c \ + safe-read.c safe-write.c save-cwd.c savedir.c setenv.c sleep.c \ + snprintf.c stdio-write.c stpcpy.c strcasecmp.c strncasecmp.c \ + strchrnul.c strdup.c strerror.c strndup.c strnlen.c \ + strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c \ + strtoumax.c tempname.c time_r.c dup-safer.c fd-safer.c \ + pipe-safer.c unlinkdir.c unsetenv.c utime.c utimens.c \ + asnprintf.c printf-args.c printf-parse.c vasnprintf.c \ + vsnprintf.c wcwidth.c write.c xmalloc.c xgetcwd.c \ xstrtol-error.c xstrtol.c xstrtoul.c LINK_WARNING_H = $(top_srcdir)/build-aux/link-warning.h charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: .SUFFIXES: .sed .sin .c .o .obj .y @@ -756,10 +847,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at-func.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backupfile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-ctype.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canonicalize-lgpl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chdir-long.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close-stream.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/closeout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creat-safer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirfd.Po@am__quote@ @@ -773,6 +866,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchmodat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchown-stub.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchownat.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fclose.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-safer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileblocks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch.Po@am__quote@ @@ -814,6 +908,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obstack.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/offtostr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-die.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat-proc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openat.Po@am__quote@ @@ -826,6 +921,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawmemchr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/realloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Po@am__quote@ @@ -842,6 +938,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio-write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdopen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpcpy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ @@ -872,6 +969,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcwidth.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xgetcwd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ @@ -901,6 +999,76 @@ distclean-compile: .y.c: $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -911,10 +1079,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$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; \ @@ -927,7 +1108,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -974,21 +1155,39 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am + $(MAKE) $(AM_MAKEFLAGS) check-recursive all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS) all-local -installdirs: +installdirs: installdirs-recursive +installdirs-am: install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am + $(MAKE) $(AM_MAKEFLAGS) install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -1012,80 +1211,82 @@ maintainer-clean-generic: -rm -f getdate.c -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am +clean: clean-recursive clean-am: clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -rf $(DEPDIR) ./$(DEPDIR) uniwidth/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive -info: info-am +info: info-recursive info-am: install-data-am: -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-exec-am: install-exec-local -install-html: install-html-am +install-html: install-html-recursive -install-info: install-info-am +install-info: install-info-recursive install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive -install-ps: install-ps-am +install-ps: install-ps-recursive installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -rf $(DEPDIR) ./$(DEPDIR) uniwidth/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-local -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: uninstall-am: uninstall-local -.MAKE: install-am install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \ - clean-generic clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am all-local check check-am clean clean-generic \ + clean-noinstLIBRARIES clean-noinstLTLIBRARIES ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-exec-local \ install-html install-html-am install-info install-info-am \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-local + 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 # We need the following in order to create when the system @@ -1152,18 +1353,41 @@ dirent.h: dirent.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ + -e 's|@''GNULIB_DIRFD''@|$(GNULIB_DIRFD)|g' \ + -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/dirent.in.h; \ } > $@-t mv $@-t $@ +# We need the following in order to create when the system +# doesn't have one that is POSIX compliant. +errno.h: errno.in.h + rm -f $@-t $@ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ + -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ + -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ + -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ + -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ + -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ + -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ + < $(srcdir)/errno.in.h; \ + } > $@-t + mv $@-t $@ + # We need the following in order to create when the system # doesn't have one that works with the given compiler. fcntl.h: fcntl.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \ -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ @@ -1176,7 +1400,8 @@ fcntl.h: fcntl.in.h float.h: float.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ < $(srcdir)/float.in.h; \ } > $@-t @@ -1204,7 +1429,8 @@ inttypes.h: inttypes.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ @@ -1275,7 +1501,8 @@ charset.alias: config.charset stdarg.h: stdarg.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ < $(srcdir)/stdarg.in.h; \ } > $@-t @@ -1296,7 +1523,8 @@ stdint.h: stdint.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ @@ -1326,17 +1554,24 @@ stdint.h: stdint.in.h stdio.h: stdio.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ + -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \ -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \ -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \ -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \ -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \ -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \ -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \ -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \ -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \ -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \ + -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \ + -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \ -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \ -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \ -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \ @@ -1344,8 +1579,18 @@ stdio.h: stdio.in.h -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \ -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \ -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \ + -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \ + -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \ + -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \ + -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \ + -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \ + -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \ + -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \ -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \ -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \ + -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \ + -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \ + -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ @@ -1358,6 +1603,8 @@ stdio.h: stdio.in.h -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ + -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ + -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ @@ -1365,9 +1612,11 @@ stdio.h: stdio.in.h -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ + -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ + -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/stdio.in.h; \ } > $@-t @@ -1378,26 +1627,41 @@ stdio.h: stdio.in.h stdlib.h: stdlib.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \ -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \ + -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \ + -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \ -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \ + -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \ + -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \ -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \ -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \ + -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \ + -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ + -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \ + -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ + -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ + -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ + -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ + -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ + -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \ + -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ @@ -1412,7 +1676,8 @@ stdlib.h: stdlib.in.h string.h: string.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \ @@ -1431,6 +1696,7 @@ string.h: string.in.h -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \ -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \ -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \ + -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \ -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \ -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \ -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \ @@ -1444,9 +1710,11 @@ string.h: string.in.h -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ + -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ + -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ @@ -1460,8 +1728,10 @@ string.h: string.in.h -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ + -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ + -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ @@ -1475,7 +1745,8 @@ string.h: string.in.h strings.h: strings.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ @@ -1490,11 +1761,16 @@ sys/stat.h: sys_stat.in.h @MKDIR_P@ sys rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \ + -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \ + -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \ + -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ - -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \ + -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ + -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/sys_stat.in.h; \ } > $@-t mv $@-t $@ @@ -1506,7 +1782,8 @@ sys/time.h: sys_time.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ @@ -1519,7 +1796,8 @@ sys/time.h: sys_time.in.h sysexits.h: sysexits.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \ < $(srcdir)/sysexits.in.h; \ } > $@-t @@ -1530,7 +1808,8 @@ sysexits.h: sysexits.in.h time.h: time.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ @@ -1548,23 +1827,39 @@ unistd.h: unistd.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ + -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ + -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ + -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ + -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ + -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ + -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ + -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ + -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ + -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ + -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ + -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ + -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ + -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ @@ -1572,11 +1867,15 @@ unistd.h: unistd.in.h -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ + -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ + -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/unistd.in.h; \ } > $@-t mv $@-t $@ @@ -1586,10 +1885,12 @@ unistd.h: unistd.in.h wchar.h: wchar.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ + -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ @@ -1603,10 +1904,12 @@ wctype.h: wctype.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ < $(srcdir)/wctype.in.h; \ } > $@-t mv $@-t $@ diff --git a/lib/argp-fmtstream.h b/lib/argp-fmtstream.h index 1cd6eac..73157e0 100644 --- a/lib/argp-fmtstream.h +++ b/lib/argp-fmtstream.h @@ -206,14 +206,44 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); inline semantics, unless -fgnu89-inline is used. It defines a macro __GNUC_STDC_INLINE__ to indicate this situation or a macro __GNUC_GNU_INLINE__ to indicate the opposite situation. + GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline semantics but warns, unless -fgnu89-inline is used: warning: C99 inline functions are not supported; using GNU89 warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute - It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. */ + It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. + + Whereas Apple GCC 4.0.1 build 5479 without -std=c99 or -std=gnu99 + implements the GNU C inline semantics and defines the macro + __GNUC_GNU_INLINE__, but it does not warn and does not support + __attribute__ ((__gnu_inline__)). + + All in all, these are the possible combinations. For every compiler, + we need to choose ARGP_FS_EI so that the corresponding table cell + contains an "ok". + + \ ARGP_FS_EI inline extern extern + \ inline inline + CC \ __attribute__ + ((gnu_inline)) + + gcc 4.3.0 error ok ok + gcc 4.3.0 -std=gnu99 -fgnu89-inline error ok ok + gcc 4.3.0 -std=gnu99 ok error ok + + gcc 4.2.2 error ok ok + gcc 4.2.2 -std=gnu99 -fgnu89-inline error ok ok + gcc 4.2.2 -std=gnu99 error warning ok + + gcc 4.1.2 error ok warning + gcc 4.1.2 -std=gnu99 error ok warning + + Apple gcc 4.0.1 error ok warning + Apple gcc 4.0.1 -std=gnu99 ok error warning + */ # if defined __GNUC_STDC_INLINE__ # define ARGP_FS_EI inline -# elif defined __GNUC_GNU_INLINE__ +# elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) # define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) # else # define ARGP_FS_EI extern inline diff --git a/lib/argp-help.c b/lib/argp-help.c index 4c0ca60..a9843c0 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -88,11 +88,11 @@ struct uparams int dup_args_note; /* Various output columns. */ - int short_opt_col; /* column in which short options start */ - int long_opt_col; /* column in which long options start */ + int short_opt_col; /* column in which short options start */ + int long_opt_col; /* column in which long options start */ int doc_opt_col; /* column in which doc options start */ int opt_doc_col; /* column in which option text starts */ - int header_col; /* column in which group headers are printed */ + int header_col; /* column in which group headers are printed */ int usage_indent; /* indentation of wrapped usage lines */ int rmargin; /* right margin used for wrapping */ @@ -160,7 +160,7 @@ fill_in_uparams (const struct argp_state *state) { const char *var = getenv ("ARGP_HELP_FMT"); struct uparams new_params = uparams; - + #define SKIPWS(p) do { while (isspace ((unsigned char) *p)) p++; } while (0); if (var) @@ -169,7 +169,7 @@ fill_in_uparams (const struct argp_state *state) while (*var) { SKIPWS (var); - + if (isalpha ((unsigned char) *var)) { size_t var_len; @@ -180,9 +180,9 @@ fill_in_uparams (const struct argp_state *state) while (isalnum ((unsigned char) *arg) || *arg == '-' || *arg == '_') arg++; var_len = arg - var; - + SKIPWS (arg); - + if (*arg == '\0' || *arg == ',') unspec = 1; else if (*arg == '=') @@ -190,7 +190,7 @@ fill_in_uparams (const struct argp_state *state) arg++; SKIPWS (arg); } - + if (unspec) { if (var[0] == 'n' && var[1] == 'o' && var[2] == '-') @@ -209,7 +209,7 @@ fill_in_uparams (const struct argp_state *state) arg++; SKIPWS (arg); } - + for (un = uparam_names; un->name; un++) if (strlen (un->name) == var_len && strncmp (var, un->name, var_len) == 0) @@ -676,7 +676,7 @@ hol_cluster_cmp (const struct hol_cluster *cl1, const struct hol_cluster *cl2) { /* If one cluster is deeper than the other, use its ancestor at the same level, so that finding the common ancestor is straightforward. - + clN->depth > 0 means that clN->parent != NULL (see hol_add_cluster) */ while (cl1->depth > cl2->depth) cl1 = cl1->parent; @@ -806,7 +806,7 @@ hol_entry_cmp (const struct hol_entry *entry1, #endif /* Compare ignoring case, except when the options are both the same letter, in which case lower-case always comes first. */ - return lower_cmp ? lower_cmp : + return lower_cmp ? lower_cmp : (rc = first2 - first1) ? rc : HOL_ENTRY_PTRCMP(entry1, entry2); } diff --git a/lib/argp-parse.c b/lib/argp-parse.c index d86256a..317ce21 100644 --- a/lib/argp-parse.c +++ b/lib/argp-parse.c @@ -889,7 +889,7 @@ __argp_parse (const struct argp *argp, int argc, char **argv, unsigned flags, #endif } #endif - + if (! (flags & ARGP_NO_HELP)) /* Add our own options. */ { diff --git a/lib/c-ctype.c b/lib/c-ctype.c new file mode 100644 index 0000000..a669d7a --- /dev/null +++ b/lib/c-ctype.c @@ -0,0 +1,398 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Character handling in C locale. + + Copyright 2000-2003, 2006 Free Software Foundation, Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#include + +/* Specification. */ +#define NO_C_CTYPE_MACROS +#include "c-ctype.h" + +/* The function isascii is not locale dependent. Its use in EBCDIC is + questionable. */ +bool +c_isascii (int c) +{ + return (c >= 0x00 && c <= 0x7f); +} + +bool +c_isalnum (int c) +{ +#if C_CTYPE_CONSECUTIVE_DIGITS \ + && C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE +#if C_CTYPE_ASCII + return ((c >= '0' && c <= '9') + || ((c & ~0x20) >= 'A' && (c & ~0x20) <= 'Z')); +#else + return ((c >= '0' && c <= '9') + || (c >= 'A' && c <= 'Z') + || (c >= 'a' && c <= 'z')); +#endif +#else + switch (c) + { + case '0': case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': + case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': + case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': + case 'Y': case 'Z': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': + case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': + case 's': case 't': case 'u': case 'v': case 'w': case 'x': + case 'y': case 'z': + return 1; + default: + return 0; + } +#endif +} + +bool +c_isalpha (int c) +{ +#if C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE +#if C_CTYPE_ASCII + return ((c & ~0x20) >= 'A' && (c & ~0x20) <= 'Z'); +#else + return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')); +#endif +#else + switch (c) + { + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': + case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': + case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': + case 'Y': case 'Z': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': + case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': + case 's': case 't': case 'u': case 'v': case 'w': case 'x': + case 'y': case 'z': + return 1; + default: + return 0; + } +#endif +} + +bool +c_isblank (int c) +{ + return (c == ' ' || c == '\t'); +} + +bool +c_iscntrl (int c) +{ +#if C_CTYPE_ASCII + return ((c & ~0x1f) == 0 || c == 0x7f); +#else + switch (c) + { + case ' ': case '!': case '"': case '#': case '$': case '%': + case '&': case '\'': case '(': case ')': case '*': case '+': + case ',': case '-': case '.': case '/': + case '0': case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + case ':': case ';': case '<': case '=': case '>': case '?': + case '@': + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': + case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': + case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': + case 'Y': case 'Z': + case '[': case '\\': case ']': case '^': case '_': case '`': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': + case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': + case 's': case 't': case 'u': case 'v': case 'w': case 'x': + case 'y': case 'z': + case '{': case '|': case '}': case '~': + return 0; + default: + return 1; + } +#endif +} + +bool +c_isdigit (int c) +{ +#if C_CTYPE_CONSECUTIVE_DIGITS + return (c >= '0' && c <= '9'); +#else + switch (c) + { + case '0': case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + return 1; + default: + return 0; + } +#endif +} + +bool +c_islower (int c) +{ +#if C_CTYPE_CONSECUTIVE_LOWERCASE + return (c >= 'a' && c <= 'z'); +#else + switch (c) + { + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': + case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': + case 's': case 't': case 'u': case 'v': case 'w': case 'x': + case 'y': case 'z': + return 1; + default: + return 0; + } +#endif +} + +bool +c_isgraph (int c) +{ +#if C_CTYPE_ASCII + return (c >= '!' && c <= '~'); +#else + switch (c) + { + case '!': case '"': case '#': case '$': case '%': case '&': + case '\'': case '(': case ')': case '*': case '+': case ',': + case '-': case '.': case '/': + case '0': case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + case ':': case ';': case '<': case '=': case '>': case '?': + case '@': + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': + case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': + case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': + case 'Y': case 'Z': + case '[': case '\\': case ']': case '^': case '_': case '`': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': + case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': + case 's': case 't': case 'u': case 'v': case 'w': case 'x': + case 'y': case 'z': + case '{': case '|': case '}': case '~': + return 1; + default: + return 0; + } +#endif +} + +bool +c_isprint (int c) +{ +#if C_CTYPE_ASCII + return (c >= ' ' && c <= '~'); +#else + switch (c) + { + case ' ': case '!': case '"': case '#': case '$': case '%': + case '&': case '\'': case '(': case ')': case '*': case '+': + case ',': case '-': case '.': case '/': + case '0': case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + case ':': case ';': case '<': case '=': case '>': case '?': + case '@': + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': + case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': + case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': + case 'Y': case 'Z': + case '[': case '\\': case ']': case '^': case '_': case '`': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + case 'g': case 'h': case 'i': case 'j': case 'k': case 'l': + case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': + case 's': case 't': case 'u': case 'v': case 'w': case 'x': + case 'y': case 'z': + case '{': case '|': case '}': case '~': + return 1; + default: + return 0; + } +#endif +} + +bool +c_ispunct (int c) +{ +#if C_CTYPE_ASCII + return ((c >= '!' && c <= '~') + && !((c >= '0' && c <= '9') + || ((c & ~0x20) >= 'A' && (c & ~0x20) <= 'Z'))); +#else + switch (c) + { + case '!': case '"': case '#': case '$': case '%': case '&': + case '\'': case '(': case ')': case '*': case '+': case ',': + case '-': case '.': case '/': + case ':': case ';': case '<': case '=': case '>': case '?': + case '@': + case '[': case '\\': case ']': case '^': case '_': case '`': + case '{': case '|': case '}': case '~': + return 1; + default: + return 0; + } +#endif +} + +bool +c_isspace (int c) +{ + return (c == ' ' || c == '\t' + || c == '\n' || c == '\v' || c == '\f' || c == '\r'); +} + +bool +c_isupper (int c) +{ +#if C_CTYPE_CONSECUTIVE_UPPERCASE + return (c >= 'A' && c <= 'Z'); +#else + switch (c) + { + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': + case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': + case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': + case 'Y': case 'Z': + return 1; + default: + return 0; + } +#endif +} + +bool +c_isxdigit (int c) +{ +#if C_CTYPE_CONSECUTIVE_DIGITS \ + && C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE +#if C_CTYPE_ASCII + return ((c >= '0' && c <= '9') + || ((c & ~0x20) >= 'A' && (c & ~0x20) <= 'F')); +#else + return ((c >= '0' && c <= '9') + || (c >= 'A' && c <= 'F') + || (c >= 'a' && c <= 'f')); +#endif +#else + switch (c) + { + case '0': case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': + return 1; + default: + return 0; + } +#endif +} + +int +c_tolower (int c) +{ +#if C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE + return (c >= 'A' && c <= 'Z' ? c - 'A' + 'a' : c); +#else + switch (c) + { + case 'A': return 'a'; + case 'B': return 'b'; + case 'C': return 'c'; + case 'D': return 'd'; + case 'E': return 'e'; + case 'F': return 'f'; + case 'G': return 'g'; + case 'H': return 'h'; + case 'I': return 'i'; + case 'J': return 'j'; + case 'K': return 'k'; + case 'L': return 'l'; + case 'M': return 'm'; + case 'N': return 'n'; + case 'O': return 'o'; + case 'P': return 'p'; + case 'Q': return 'q'; + case 'R': return 'r'; + case 'S': return 's'; + case 'T': return 't'; + case 'U': return 'u'; + case 'V': return 'v'; + case 'W': return 'w'; + case 'X': return 'x'; + case 'Y': return 'y'; + case 'Z': return 'z'; + default: return c; + } +#endif +} + +int +c_toupper (int c) +{ +#if C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE + return (c >= 'a' && c <= 'z' ? c - 'a' + 'A' : c); +#else + switch (c) + { + case 'a': return 'A'; + case 'b': return 'B'; + case 'c': return 'C'; + case 'd': return 'D'; + case 'e': return 'E'; + case 'f': return 'F'; + case 'g': return 'G'; + case 'h': return 'H'; + case 'i': return 'I'; + case 'j': return 'J'; + case 'k': return 'K'; + case 'l': return 'L'; + case 'm': return 'M'; + case 'n': return 'N'; + case 'o': return 'O'; + case 'p': return 'P'; + case 'q': return 'Q'; + case 'r': return 'R'; + case 's': return 'S'; + case 't': return 'T'; + case 'u': return 'U'; + case 'v': return 'V'; + case 'w': return 'W'; + case 'x': return 'X'; + case 'y': return 'Y'; + case 'z': return 'Z'; + default: return c; + } +#endif +} diff --git a/lib/c-ctype.h b/lib/c-ctype.h new file mode 100644 index 0000000..a0ab083 --- /dev/null +++ b/lib/c-ctype.h @@ -0,0 +1,297 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Character handling in C locale. + + These functions work like the corresponding functions in , + except that they have the C (POSIX) locale hardwired, whereas the + functions' behaviour depends on the current locale set via + setlocale. + + Copyright (C) 2000-2003, 2006, 2008 Free Software Foundation, Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef C_CTYPE_H +#define C_CTYPE_H + +#include + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* The functions defined in this file assume the "C" locale and a character + set without diacritics (ASCII-US or EBCDIC-US or something like that). + Even if the "C" locale on a particular system is an extension of the ASCII + character set (like on BeOS, where it is UTF-8, or on AmigaOS, where it + is ISO-8859-1), the functions in this file recognize only the ASCII + characters. */ + + +/* Check whether the ASCII optimizations apply. */ + +/* ANSI C89 (and ISO C99 5.2.1.3 too) already guarantees that + '0', '1', ..., '9' have consecutive integer values. */ +#define C_CTYPE_CONSECUTIVE_DIGITS 1 + +#if ('A' <= 'Z') \ + && ('A' + 1 == 'B') && ('B' + 1 == 'C') && ('C' + 1 == 'D') \ + && ('D' + 1 == 'E') && ('E' + 1 == 'F') && ('F' + 1 == 'G') \ + && ('G' + 1 == 'H') && ('H' + 1 == 'I') && ('I' + 1 == 'J') \ + && ('J' + 1 == 'K') && ('K' + 1 == 'L') && ('L' + 1 == 'M') \ + && ('M' + 1 == 'N') && ('N' + 1 == 'O') && ('O' + 1 == 'P') \ + && ('P' + 1 == 'Q') && ('Q' + 1 == 'R') && ('R' + 1 == 'S') \ + && ('S' + 1 == 'T') && ('T' + 1 == 'U') && ('U' + 1 == 'V') \ + && ('V' + 1 == 'W') && ('W' + 1 == 'X') && ('X' + 1 == 'Y') \ + && ('Y' + 1 == 'Z') +#define C_CTYPE_CONSECUTIVE_UPPERCASE 1 +#endif + +#if ('a' <= 'z') \ + && ('a' + 1 == 'b') && ('b' + 1 == 'c') && ('c' + 1 == 'd') \ + && ('d' + 1 == 'e') && ('e' + 1 == 'f') && ('f' + 1 == 'g') \ + && ('g' + 1 == 'h') && ('h' + 1 == 'i') && ('i' + 1 == 'j') \ + && ('j' + 1 == 'k') && ('k' + 1 == 'l') && ('l' + 1 == 'm') \ + && ('m' + 1 == 'n') && ('n' + 1 == 'o') && ('o' + 1 == 'p') \ + && ('p' + 1 == 'q') && ('q' + 1 == 'r') && ('r' + 1 == 's') \ + && ('s' + 1 == 't') && ('t' + 1 == 'u') && ('u' + 1 == 'v') \ + && ('v' + 1 == 'w') && ('w' + 1 == 'x') && ('x' + 1 == 'y') \ + && ('y' + 1 == 'z') +#define C_CTYPE_CONSECUTIVE_LOWERCASE 1 +#endif + +#if (' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ + && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ + && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ + && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ + && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ + && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ + && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ + && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ + && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ + && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ + && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ + && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ + && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ + && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ + && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ + && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ + && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ + && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ + && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ + && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ + && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126) +/* The character set is ASCII or one of its variants or extensions, not EBCDIC. + Testing the value of '\n' and '\r' is not relevant. */ +#define C_CTYPE_ASCII 1 +#endif + + +/* Function declarations. */ + +/* Unlike the functions in , which require an argument in the range + of the 'unsigned char' type, the functions here operate on values that are + in the 'unsigned char' range or in the 'char' range. In other words, + when you have a 'char' value, you need to cast it before using it as + argument to a function: + + const char *s = ...; + if (isalpha ((unsigned char) *s)) ... + + but you don't need to cast it for the functions defined in this file: + + const char *s = ...; + if (c_isalpha (*s)) ... + */ + +extern bool c_isascii (int c); /* not locale dependent */ + +extern bool c_isalnum (int c); +extern bool c_isalpha (int c); +extern bool c_isblank (int c); +extern bool c_iscntrl (int c); +extern bool c_isdigit (int c); +extern bool c_islower (int c); +extern bool c_isgraph (int c); +extern bool c_isprint (int c); +extern bool c_ispunct (int c); +extern bool c_isspace (int c); +extern bool c_isupper (int c); +extern bool c_isxdigit (int c); + +extern int c_tolower (int c); +extern int c_toupper (int c); + + +#if defined __GNUC__ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ && !defined NO_C_CTYPE_MACROS + +/* ASCII optimizations. */ + +#undef c_isascii +#define c_isascii(c) \ + ({ int __c = (c); \ + (__c >= 0x00 && __c <= 0x7f); \ + }) + +#if C_CTYPE_CONSECUTIVE_DIGITS \ + && C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE +#if C_CTYPE_ASCII +#undef c_isalnum +#define c_isalnum(c) \ + ({ int __c = (c); \ + ((__c >= '0' && __c <= '9') \ + || ((__c & ~0x20) >= 'A' && (__c & ~0x20) <= 'Z')); \ + }) +#else +#undef c_isalnum +#define c_isalnum(c) \ + ({ int __c = (c); \ + ((__c >= '0' && __c <= '9') \ + || (__c >= 'A' && __c <= 'Z') \ + || (__c >= 'a' && __c <= 'z')); \ + }) +#endif +#endif + +#if C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE +#if C_CTYPE_ASCII +#undef c_isalpha +#define c_isalpha(c) \ + ({ int __c = (c); \ + ((__c & ~0x20) >= 'A' && (__c & ~0x20) <= 'Z'); \ + }) +#else +#undef c_isalpha +#define c_isalpha(c) \ + ({ int __c = (c); \ + ((__c >= 'A' && __c <= 'Z') || (__c >= 'a' && __c <= 'z')); \ + }) +#endif +#endif + +#undef c_isblank +#define c_isblank(c) \ + ({ int __c = (c); \ + (__c == ' ' || __c == '\t'); \ + }) + +#if C_CTYPE_ASCII +#undef c_iscntrl +#define c_iscntrl(c) \ + ({ int __c = (c); \ + ((__c & ~0x1f) == 0 || __c == 0x7f); \ + }) +#endif + +#if C_CTYPE_CONSECUTIVE_DIGITS +#undef c_isdigit +#define c_isdigit(c) \ + ({ int __c = (c); \ + (__c >= '0' && __c <= '9'); \ + }) +#endif + +#if C_CTYPE_CONSECUTIVE_LOWERCASE +#undef c_islower +#define c_islower(c) \ + ({ int __c = (c); \ + (__c >= 'a' && __c <= 'z'); \ + }) +#endif + +#if C_CTYPE_ASCII +#undef c_isgraph +#define c_isgraph(c) \ + ({ int __c = (c); \ + (__c >= '!' && __c <= '~'); \ + }) +#endif + +#if C_CTYPE_ASCII +#undef c_isprint +#define c_isprint(c) \ + ({ int __c = (c); \ + (__c >= ' ' && __c <= '~'); \ + }) +#endif + +#if C_CTYPE_ASCII +#undef c_ispunct +#define c_ispunct(c) \ + ({ int _c = (c); \ + (c_isgraph (_c) && ! c_isalnum (_c)); \ + }) +#endif + +#undef c_isspace +#define c_isspace(c) \ + ({ int __c = (c); \ + (__c == ' ' || __c == '\t' \ + || __c == '\n' || __c == '\v' || __c == '\f' || __c == '\r'); \ + }) + +#if C_CTYPE_CONSECUTIVE_UPPERCASE +#undef c_isupper +#define c_isupper(c) \ + ({ int __c = (c); \ + (__c >= 'A' && __c <= 'Z'); \ + }) +#endif + +#if C_CTYPE_CONSECUTIVE_DIGITS \ + && C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE +#if C_CTYPE_ASCII +#undef c_isxdigit +#define c_isxdigit(c) \ + ({ int __c = (c); \ + ((__c >= '0' && __c <= '9') \ + || ((__c & ~0x20) >= 'A' && (__c & ~0x20) <= 'F')); \ + }) +#else +#undef c_isxdigit +#define c_isxdigit(c) \ + ({ int __c = (c); \ + ((__c >= '0' && __c <= '9') \ + || (__c >= 'A' && __c <= 'F') \ + || (__c >= 'a' && __c <= 'f')); \ + }) +#endif +#endif + +#if C_CTYPE_CONSECUTIVE_UPPERCASE && C_CTYPE_CONSECUTIVE_LOWERCASE +#undef c_tolower +#define c_tolower(c) \ + ({ int __c = (c); \ + (__c >= 'A' && __c <= 'Z' ? __c - 'A' + 'a' : __c); \ + }) +#undef c_toupper +#define c_toupper(c) \ + ({ int __c = (c); \ + (__c >= 'a' && __c <= 'z' ? __c - 'a' + 'A' : __c); \ + }) +#endif + +#endif /* optimizing for speed */ + + +#ifdef __cplusplus +} +#endif + +#endif /* C_CTYPE_H */ diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index 80bef72..3aaa310 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -260,7 +260,7 @@ __realpath (const char *name, char *resolved) goto error; } - n = __readlink (rpath, buf, path_max); + n = __readlink (rpath, buf, path_max - 1); if (n < 0) { int saved_errno = errno; diff --git a/lib/chdir-long.c b/lib/chdir-long.c index aeae252..291b58c 100644 --- a/lib/chdir-long.c +++ b/lib/chdir-long.c @@ -1,5 +1,5 @@ /* provide a chdir function that tries not to fail due to ENAMETOOLONG - Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -205,7 +205,6 @@ chdir_long (char *dir) #if TEST_CHDIR -# include # include "closeout.h" # include "error.h" diff --git a/lib/close-stream.c b/lib/close-stream.c index e2c3ac0..59ab616 100644 --- a/lib/close-stream.c +++ b/lib/close-stream.c @@ -1,6 +1,6 @@ /* Close a stream, with nicer error checking than fclose's. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2007 Free + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -33,6 +33,10 @@ otherwise. A failure might set errno to 0 if the error number cannot be determined. + A failure with errno set to EPIPE may or may not indicate an error + situation worth signaling to the user. See the documentation of the + close_stdout_set_ignore_EPIPE function for details. + If a program writes *anything* to STREAM, that program should close STREAM and make sure that it succeeds before exiting. Otherwise, suppose that you go to the extreme of checking the return status diff --git a/lib/close.c b/lib/close.c new file mode 100644 index 0000000..74a7adf --- /dev/null +++ b/lib/close.c @@ -0,0 +1,82 @@ +/* close replacement. + Copyright (C) 2008 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +#if GNULIB_SYS_SOCKET +# define WIN32_LEAN_AND_MEAN +# include +#endif + +#if HAVE__GL_CLOSE_FD_MAYBE_SOCKET + +/* Get set_winsock_errno, FD_TO_SOCKET etc. */ +#include "w32sock.h" + +static int +_gl_close_fd_maybe_socket (int fd) +{ + SOCKET sock = FD_TO_SOCKET (fd); + WSANETWORKEVENTS ev; + + ev.lNetworkEvents = 0xDEADBEEF; + WSAEnumNetworkEvents (sock, NULL, &ev); + if (ev.lNetworkEvents != 0xDEADBEEF) + { + /* FIXME: other applications, like squid, use an undocumented + _free_osfhnd free function. But this is not enough: The 'osfile' + flags for fd also needs to be cleared, but it is hard to access it. + Instead, here we just close twice the file descriptor. */ + if (closesocket (sock)) + { + set_winsock_errno (); + return -1; + } + else + { + /* This call frees the file descriptor and does a + CloseHandle ((HANDLE) _get_osfhandle (fd)), which fails. */ + _close (fd); + return 0; + } + } + else + return _close (fd); +} +#endif + +/* Override close() to call into other gnulib modules. */ + +int +rpl_close (int fd) +#undef close +{ +#if HAVE__GL_CLOSE_FD_MAYBE_SOCKET + int retval = _gl_close_fd_maybe_socket (fd); +#else + int retval = close (fd); +#endif + +#ifdef FCHDIR_REPLACEMENT + if (retval >= 0) + _gl_unregister_fd (fd); +#endif + + return retval; +} diff --git a/lib/closeout.c b/lib/closeout.c index 69ddb8b..6a0b82f 100644 --- a/lib/closeout.c +++ b/lib/closeout.c @@ -1,6 +1,6 @@ /* Close standard output and standard error, exiting with a diagnostic on error. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006 Free + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -21,6 +21,7 @@ #include "closeout.h" #include +#include #include #include @@ -42,6 +43,43 @@ close_stdout_set_file_name (const char *file) file_name = file; } +static bool ignore_EPIPE /* = false */; + +/* Specify the reaction to an EPIPE error during the closing of stdout: + - If ignore = true, it shall be ignored. + - If ignore = false, it shall evoke a diagnostic, along with a nonzero + exit status. + The default is ignore = false. + + This setting matters only if the SIGPIPE signal is ignored (i.e. its + handler set to SIG_IGN) or blocked. Only particular programs need to + temporarily ignore SIGPIPE. If SIGPIPE is ignored or blocked because + it was ignored or blocked in the parent process when it created the + child process, it usually is a bug in the parent process: It is bad + practice to have SIGPIPE ignored or blocked while creating a child + process. + + EPIPE occurs when writing to a pipe or socket that has no readers now, + when SIGPIPE is ignored or blocked. + + The ignore = false setting is suitable for a scenario where it is normally + guaranteed that the pipe writer terminates before the pipe reader. In + this case, an EPIPE is an indication of a premature termination of the + pipe reader and should lead to a diagnostic and a nonzero exit status. + + The ignore = true setting is suitable for a scenario where you don't know + ahead of time whether the pipe writer or the pipe reader will terminate + first. In this case, an EPIPE is an indication that the pipe writer can + stop doing useless write() calls; this is what close_stdout does anyway. + EPIPE is part of the normal pipe/socket shutdown protocol in this case, + and should not lead to a diagnostic message. */ + +void +close_stdout_set_ignore_EPIPE (bool ignore) +{ + ignore_EPIPE = ignore; +} + /* Close standard output. On error, issue a diagnostic and _exit with status 'exit_failure'. @@ -68,7 +106,8 @@ close_stdout_set_file_name (const char *file) void close_stdout (void) { - if (close_stream (stdout) != 0) + if (close_stream (stdout) != 0 + && !(ignore_EPIPE && errno == EPIPE)) { char const *write_error = _("write error"); if (file_name) diff --git a/lib/closeout.h b/lib/closeout.h index fa7adc3..34e61ef 100644 --- a/lib/closeout.h +++ b/lib/closeout.h @@ -1,6 +1,7 @@ /* Close standard output and standard error. - Copyright (C) 1998, 2000, 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 1998, 2000, 2003, 2004, 2006, 2008 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,11 +19,14 @@ #ifndef CLOSEOUT_H # define CLOSEOUT_H 1 +# include + # ifdef __cplusplus extern "C" { # endif void close_stdout_set_file_name (const char *file); +void close_stdout_set_ignore_EPIPE (bool ignore); void close_stdout (void); # ifdef __cplusplus diff --git a/lib/dirent.in.h b/lib/dirent.in.h index db3de95..2b1d0a5 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -1,5 +1,5 @@ -/* Wrapper around . - Copyright (C) 2006-2007 Free Software Foundation, Inc. +/* A GNU-like . + Copyright (C) 2006-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,19 +16,25 @@ #ifndef _GL_DIRENT_H +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_DIRENT_H@ #ifndef _GL_DIRENT_H #define _GL_DIRENT_H +/* The definition of GL_LINK_WARNING is copied here. */ -/* Declare overridden functions. */ #ifdef __cplusplus extern "C" { #endif +/* Declare overridden functions. */ + #if @REPLACE_FCHDIR@ # define opendir rpl_opendir extern DIR * opendir (const char *); @@ -36,6 +42,22 @@ extern DIR * opendir (const char *); extern int closedir (DIR *); #endif +/* Declare GNU extensions. */ + +#if @GNULIB_DIRFD@ +# if !@HAVE_DECL_DIRFD@ && !defined dirfd +/* Return the file descriptor associated with the given directory stream, + or -1 if none exists. */ +extern int dirfd (DIR const *dir); +# endif +#elif defined GNULIB_POSIXCHECK +# undef dirfd +# define dirfd(d) \ + (GL_LINK_WARNING ("dirfd is unportable - " \ + "use gnulib module dirfd for portability"), \ + dirfd (d)) +#endif + #ifdef __cplusplus } #endif diff --git a/lib/dirfd.c b/lib/dirfd.c index 18f5154..3458e99 100644 --- a/lib/dirfd.c +++ b/lib/dirfd.c @@ -1,6 +1,6 @@ /* dirfd.c -- return the file descriptor associated with an open DIR* - Copyright (C) 2001, 2006 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #include -#include "dirfd.h" +#include int dirfd (DIR const *dir_p) diff --git a/lib/dirfd.h b/lib/dirfd.h deleted file mode 100644 index 2c2b21d..0000000 --- a/lib/dirfd.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Declare dirfd, if necessary. - Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General 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 - -#ifndef HAVE_DECL_DIRFD -"this configure-time declaration test was not run" -#endif -#if !HAVE_DECL_DIRFD && !defined dirfd -int dirfd (DIR const *); -#endif diff --git a/lib/errno.in.h b/lib/errno.in.h new file mode 100644 index 0000000..f873039 --- /dev/null +++ b/lib/errno.in.h @@ -0,0 +1,157 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* A POSIX-like . + + Copyright (C) 2008 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef _GL_ERRNO_H + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + +/* The include_next requires a split double-inclusion guard. */ +#@INCLUDE_NEXT@ @NEXT_ERRNO_H@ + +#ifndef _GL_ERRNO_H +#define _GL_ERRNO_H + + +/* On native Windows platforms, many macros are not defined. */ +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + +/* POSIX says that EAGAIN and EWOULDBLOCK may have the same value. */ +# define EWOULDBLOCK EAGAIN + +/* Values >= 100 seem safe to use. */ +# define ETXTBSY 100 +# define GNULIB_defined_ETXTBSY 1 + +/* These are intentionally the same values as the WSA* error numbers, defined + in . */ +# define EINPROGRESS 10036 +# define EALREADY 10037 +# define ENOTSOCK 10038 +# define EDESTADDRREQ 10039 +# define EMSGSIZE 10040 +# define EPROTOTYPE 10041 +# define ENOPROTOOPT 10042 +# define EPROTONOSUPPORT 10043 +# define ESOCKTNOSUPPORT 10044 /* not required by POSIX */ +# define EOPNOTSUPP 10045 +# define EPFNOSUPPORT 10046 /* not required by POSIX */ +# define EAFNOSUPPORT 10047 +# define EADDRINUSE 10048 +# define EADDRNOTAVAIL 10049 +# define ENETDOWN 10050 +# define ENETUNREACH 10051 +# define ENETRESET 10052 +# define ECONNABORTED 10053 +# define ECONNRESET 10054 +# define ENOBUFS 10055 +# define EISCONN 10056 +# define ENOTCONN 10057 +# define ESHUTDOWN 10058 /* not required by POSIX */ +# define ETOOMANYREFS 10059 /* not required by POSIX */ +# define ETIMEDOUT 10060 +# define ECONNREFUSED 10061 +# define ELOOP 10062 +# define EHOSTDOWN 10064 /* not required by POSIX */ +# define EHOSTUNREACH 10065 +# define EPROCLIM 10067 /* not required by POSIX */ +# define EUSERS 10068 /* not required by POSIX */ +# define EDQUOT 10069 +# define ESTALE 10070 +# define EREMOTE 10071 /* not required by POSIX */ +# define GNULIB_defined_ESOCK 1 + +# endif + + +/* On OSF/1 5.1, when _XOPEN_SOURCE_EXTENDED is not defined, the macros + EMULTIHOP, ENOLINK, EOVERFLOW are not defined. */ +# if @EMULTIHOP_HIDDEN@ +# define EMULTIHOP @EMULTIHOP_VALUE@ +# define GNULIB_defined_EMULTIHOP 1 +# endif +# if @ENOLINK_HIDDEN@ +# define ENOLINK @ENOLINK_VALUE@ +# define GNULIB_defined_ENOLINK 1 +# endif +# if @EOVERFLOW_HIDDEN@ +# define EOVERFLOW @EOVERFLOW_VALUE@ +# define GNULIB_defined_EOVERFLOW 1 +# endif + + +/* On OpenBSD 4.0 and on native Windows, the macros ENOMSG, EIDRM, ENOLINK, + EPROTO, EMULTIHOP, EBADMSG, EOVERFLOW, ENOTSUP, ECANCELED are not defined. + Define them here. Values >= 2000 seem safe to use: Solaris ESTALE = 151, + HP-UX EWOULDBLOCK = 246, IRIX EDQUOT = 1133. + + Note: When one of these systems defines some of these macros some day, + binaries will have to be recompiled so that they recognizes the new + errno values from the system. */ + +# ifndef ENOMSG +# define ENOMSG 2000 +# define GNULIB_defined_ENOMSG 1 +# endif + +# ifndef EIDRM +# define EIDRM 2001 +# define GNULIB_defined_EIDRM 1 +# endif + +# ifndef ENOLINK +# define ENOLINK 2002 +# define GNULIB_defined_ENOLINK 1 +# endif + +# ifndef EPROTO +# define EPROTO 2003 +# define GNULIB_defined_EPROTO 1 +# endif + +# ifndef EMULTIHOP +# define EMULTIHOP 2004 +# define GNULIB_defined_EMULTIHOP 1 +# endif + +# ifndef EBADMSG +# define EBADMSG 2005 +# define GNULIB_defined_EBADMSG 1 +# endif + +# ifndef EOVERFLOW +# define EOVERFLOW 2006 +# define GNULIB_defined_EOVERFLOW 1 +# endif + +# ifndef ENOTSUP +# define ENOTSUP 2007 +# define GNULIB_defined_ENOTSUP 1 +# endif + +# ifndef ECANCELED +# define ECANCELED 2008 +# define GNULIB_defined_ECANCELED 1 +# endif + + +#endif /* _GL_ERRNO_H */ +#endif /* _GL_ERRNO_H */ diff --git a/lib/fchdir.c b/lib/fchdir.c index 246987c..969e984 100644 --- a/lib/fchdir.c +++ b/lib/fchdir.c @@ -1,5 +1,5 @@ /* fchdir replacement. - Copyright (C) 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2006-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ /* Specification. */ #include +#include #include #include #include @@ -26,10 +27,8 @@ #include #include #include -#include #include "canonicalize.h" -#include "dirfd.h" /* This replacement assumes that a directory is not renamed while opened through a file descriptor. */ @@ -75,64 +74,34 @@ ensure_dirs_slot (size_t fd) } } -/* Override open() and close(), to keep track of the open file descriptors. */ +/* Hook into the gnulib replacements for open() and close() to keep track + of the open file descriptors. */ -int -rpl_close (int fd) -#undef close +void +_gl_unregister_fd (int fd) { - int retval = close (fd); - - if (retval >= 0 && fd >= 0 && fd < dirs_allocated) + if (fd >= 0 && fd < dirs_allocated) { if (dirs[fd].name != NULL) free (dirs[fd].name); dirs[fd].name = NULL; dirs[fd].saved_errno = ENOTDIR; } - return retval; } -int -rpl_open (const char *filename, int flags, ...) -#undef open +void +_gl_register_fd (int fd, const char *filename) { - mode_t mode; - int fd; struct stat statbuf; - mode = 0; - if (flags & O_CREAT) + ensure_dirs_slot (fd); + if (fd < dirs_allocated + && fstat (fd, &statbuf) >= 0 && S_ISDIR (statbuf.st_mode)) { - va_list arg; - va_start (arg, flags); - - /* If mode_t is narrower than int, use the promoted type (int), - not mode_t. Use sizeof to guess whether mode_t is narrower; - we don't know of any practical counterexamples. */ - mode = (sizeof (mode_t) < sizeof (int) - ? va_arg (arg, int) - : va_arg (arg, mode_t)); - - va_end (arg); + dirs[fd].name = canonicalize_file_name (filename); + if (dirs[fd].name == NULL) + dirs[fd].saved_errno = errno; } -#if defined GNULIB_OPEN && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) - if (strcmp (filename, "/dev/null") == 0) - filename = "NUL"; -#endif - fd = open (filename, flags, mode); - if (fd >= 0) - { - ensure_dirs_slot (fd); - if (fd < dirs_allocated - && fstat (fd, &statbuf) >= 0 && S_ISDIR (statbuf.st_mode)) - { - dirs[fd].name = canonicalize_file_name (filename); - if (dirs[fd].name == NULL) - dirs[fd].saved_errno = errno; - } - } - return fd; } /* Override opendir() and closedir(), to keep track of the open file @@ -145,13 +114,8 @@ rpl_closedir (DIR *dp) int fd = dirfd (dp); int retval = closedir (dp); - if (retval >= 0 && fd >= 0 && fd < dirs_allocated) - { - if (dirs[fd].name != NULL) - free (dirs[fd].name); - dirs[fd].name = NULL; - dirs[fd].saved_errno = ENOTDIR; - } + if (retval >= 0) + _gl_unregister_fd (fd); return retval; } @@ -166,15 +130,7 @@ rpl_opendir (const char *filename) { int fd = dirfd (dp); if (fd >= 0) - { - ensure_dirs_slot (fd); - if (fd < dirs_allocated) - { - dirs[fd].name = canonicalize_file_name (filename); - if (dirs[fd].name == NULL) - dirs[fd].saved_errno = errno; - } - } + _gl_register_fd (fd, filename); } return dp; } diff --git a/lib/lstat.h b/lib/fclose.c similarity index 53% rename from lib/lstat.h rename to lib/fclose.c index 63b21c8..a0074b7 100644 --- a/lib/lstat.h +++ b/lib/fclose.c @@ -1,5 +1,5 @@ -/* Retrieving information about files. - Copyright (C) 2005 Free Software Foundation, Inc. +/* fclose replacement. + Copyright (C) 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,10 +14,34 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include +#include -#if !LSTAT_FOLLOWS_SLASHED_SYMLINK -extern int rpl_lstat (const char *name, struct stat *buf); -# undef lstat -# define lstat rpl_lstat -#endif +/* Specification. */ +#include + +#include +#include + +/* Override fclose() to call the overridden close(). */ + +int +rpl_fclose (FILE *fp) +#undef fclose +{ + int saved_errno = 0; + + if (fflush (fp)) + saved_errno = errno; + + if (close (fileno (fp)) < 0 && saved_errno == 0) + saved_errno = errno; + + fclose (fp); /* will fail with errno = EBADF */ + + if (saved_errno != 0) + { + errno = saved_errno; + return EOF; + } + return 0; +} diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index 066a26c..af86c83 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like , but with non-working flags defined to 0. - Copyright (C) 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2006-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,6 +17,21 @@ /* written by Paul Eggert */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + +#if defined __need_system_fcntl_h +/* Special invocation convention. */ + +#include +#include +#include +#@INCLUDE_NEXT@ @NEXT_FCNTL_H@ + +#else +/* Normal invocation convention. */ + #ifndef _GL_FCNTL_H #include @@ -35,9 +50,17 @@ extern "C" { #endif -#if (@GNULIB_OPEN@ && @REPLACE_OPEN@) || defined FCHDIR_REPLACEMENT -# define open rpl_open +#if @GNULIB_OPEN@ +# if @REPLACE_OPEN@ +# undef open +# define open rpl_open extern int open (const char *filename, int flags, ...); +# endif +#endif + +#ifdef FCHDIR_REPLACEMENT +/* gnulib internal function. */ +extern void _gl_register_fd (int fd, const char *filename); #endif #ifdef __cplusplus @@ -118,3 +141,4 @@ extern int open (const char *filename, int flags, ...); #endif /* _GL_FCNTL_H */ #endif /* _GL_FCNTL_H */ +#endif diff --git a/lib/float.in.h b/lib/float.in.h index 2504032..9ba2bce 100644 --- a/lib/float.in.h +++ b/lib/float.in.h @@ -1,6 +1,6 @@ /* A correct . - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,6 +17,10 @@ #ifndef _GL_FLOAT_H +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_FLOAT_H@ diff --git a/lib/fseeko.c b/lib/fseeko.c index 7252208..4d6b071 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -25,6 +25,8 @@ /* Get off_t and lseek. */ #include +#include "stdio-impl.h" + #undef fseeko #if !HAVE_FSEEKO # undef fseek @@ -41,18 +43,11 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) #endif /* These tests are based on fpurge.c. */ -#if defined _IO_ferror_unlocked /* GNU libc, BeOS */ +#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ if (fp->_IO_read_end == fp->_IO_read_ptr && fp->_IO_write_ptr == fp->_IO_write_base && fp->_IO_save_base == NULL) -#elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ -# if defined __NetBSD__ || defined __OpenBSD__ /* NetBSD, OpenBSD */ - /* See - and */ -# define fp_ub ((struct { struct __sbuf _ub; } *) fp->_ext._base)->_ub -# else /* FreeBSD, MacOS X, Cygwin */ -# define fp_ub fp->_ub -# endif +#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ # if defined __SL64 && defined __SCLE /* Cygwin */ if ((fp->_flags & __SL64) == 0) { @@ -66,32 +61,20 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) fclose (tmp); } # endif - if (fp->_p == fp->_bf._base - && fp->_r == 0 - && fp->_w == ((fp->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ - ? fp->_bf._size - : 0) + if (fp_->_p == fp_->_bf._base + && fp_->_r == 0 + && fp_->_w == ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ + ? fp_->_bf._size + : 0) && fp_ub._base == NULL) +#elif defined __EMX__ /* emx+gcc */ + if (fp->_ptr == fp->_buffer + && fp->_rcount == 0 + && fp->_wcount == 0 + && fp->_ungetc_count == 0) #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ -# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ -# define fp_ ((struct { unsigned char *_ptr; \ - unsigned char *_base; \ - unsigned char *_end; \ - long _cnt; \ - int _file; \ - unsigned int _flag; \ - } *) fp) if (fp_->_ptr == fp_->_base && (fp_->_ptr == NULL || fp_->_cnt == 0)) -# else -# if defined _SCO_DS /* OpenServer */ -# define _base __base -# define _ptr __ptr -# define _cnt __cnt -# endif - if (fp->_ptr == fp->_base - && (fp->_ptr == NULL || fp->_cnt == 0)) -# endif #elif defined __UCLIBC__ /* uClibc */ if (((fp->__modeflags & __FLAG_WRITING) == 0 || fp->__bufpos == fp->__bufstart) @@ -108,21 +91,20 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) off_t pos = lseek (fileno (fp), offset, whence); if (pos == -1) { -#if defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ - fp->_flags &= ~__SOFF; +#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_flags &= ~__SOFF; #endif return -1; } else { -#if defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ - fp->_offset = pos; - fp->_flags |= __SOFF; - fp->_flags &= ~__SEOF; +#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + fp_->_offset = pos; + fp_->_flags |= __SOFF; + fp_->_flags &= ~__SEOF; +#elif defined __EMX__ /* emx+gcc */ + fp->_flags &= ~_IOEOF; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ -# if defined _SCO_DS /* OpenServer */ -# define _flag __flag -# endif fp->_flag &= ~_IOEOF; #endif return 0; diff --git a/lib/getcwd.c b/lib/getcwd.c index 2397c08..b9e57d3 100644 --- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2004,2005,2006,2007 Free Software - Foundation, Inc. +/* Copyright (C) 1991-1999, 2004-2008 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 @@ -18,7 +17,6 @@ #if !_LIBC # include # include -# include "dirfd.h" #endif #include diff --git a/lib/getdate.c b/lib/getdate.c index 07a293b..2e5f210 100644 --- a/lib/getdate.c +++ b/lib/getdate.c @@ -74,17 +74,18 @@ tMINUTE_UNIT = 263, tSEC_UNIT = 264, tDAY_UNIT = 265, - tDAY = 266, - tDAYZONE = 267, - tLOCAL_ZONE = 268, - tMERIDIAN = 269, - tMONTH = 270, - tORDINAL = 271, - tZONE = 272, - tSNUMBER = 273, - tUNUMBER = 274, - tSDECIMAL_NUMBER = 275, - tUDECIMAL_NUMBER = 276 + tDAY_SHIFT = 266, + tDAY = 267, + tDAYZONE = 268, + tLOCAL_ZONE = 269, + tMERIDIAN = 270, + tMONTH = 271, + tORDINAL = 272, + tZONE = 273, + tSNUMBER = 274, + tUNUMBER = 275, + tSDECIMAL_NUMBER = 276, + tUDECIMAL_NUMBER = 277 }; #endif /* Tokens. */ @@ -96,17 +97,18 @@ #define tMINUTE_UNIT 263 #define tSEC_UNIT 264 #define tDAY_UNIT 265 -#define tDAY 266 -#define tDAYZONE 267 -#define tLOCAL_ZONE 268 -#define tMERIDIAN 269 -#define tMONTH 270 -#define tORDINAL 271 -#define tZONE 272 -#define tSNUMBER 273 -#define tUNUMBER 274 -#define tSDECIMAL_NUMBER 275 -#define tUDECIMAL_NUMBER 276 +#define tDAY_SHIFT 266 +#define tDAY 267 +#define tDAYZONE 268 +#define tLOCAL_ZONE 269 +#define tMERIDIAN 270 +#define tMONTH 271 +#define tORDINAL 272 +#define tZONE 273 +#define tSNUMBER 274 +#define tUNUMBER 275 +#define tSDECIMAL_NUMBER 276 +#define tUDECIMAL_NUMBER 277 @@ -116,8 +118,8 @@ /* Parse a string into an internal time stamp. - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007 Free Software - Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -175,7 +177,7 @@ # undef static #endif -#include +#include #include #include #include @@ -320,7 +322,7 @@ typedef struct union YYSTYPE; static int yylex (union YYSTYPE *, parser_control *); static int yyerror (parser_control const *, char const *); -static long int time_zone_hhmm (textint, long int); +static long int time_zone_hhmm (parser_control *, textint, long int); /* Extract into *PC any date and time info from a string of digits of the form e.g., YYYYMMDD, YYMMDD, HHMM, HH (and sometimes YYY, @@ -361,6 +363,31 @@ digits_to_date_time (parser_control *pc, textint text_int) } } +/* Increment PC->rel by FACTOR * REL (FACTOR is 1 or -1). */ +static void +apply_relative_time (parser_control *pc, relative_time rel, int factor) +{ + pc->rel.ns += factor * rel.ns; + pc->rel.seconds += factor * rel.seconds; + pc->rel.minutes += factor * rel.minutes; + pc->rel.hour += factor * rel.hour; + pc->rel.day += factor * rel.day; + pc->rel.month += factor * rel.month; + pc->rel.year += factor * rel.year; + pc->rels_seen = true; +} + +/* Set PC-> hour, minutes, seconds and nanoseconds members from arguments. */ +static void +set_hhmmss (parser_control *pc, long int hour, long int minutes, + time_t sec, long int nsec) +{ + pc->hour = hour; + pc->minutes = minutes; + pc->seconds.tv_sec = sec; + pc->seconds.tv_nsec = nsec; +} + /* Enabling traces. */ @@ -383,7 +410,7 @@ digits_to_date_time (parser_control *pc, textint text_int) #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 261 "getdate.y" +#line 286 "getdate.y" { long int intval; textint textintval; @@ -391,7 +418,7 @@ typedef union YYSTYPE relative_time rel; } /* Line 187 of yacc.c. */ -#line 395 "getdate.c" +#line 422 "getdate.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -404,7 +431,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 408 "getdate.c" +#line 435 "getdate.c" #ifdef short # undef short @@ -619,20 +646,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 12 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 96 +#define YYLAST 98 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 26 +#define YYNTOKENS 27 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 20 +#define YYNNTS 21 /* YYNRULES -- Number of rules. */ -#define YYNRULES 80 +#define YYNRULES 82 /* YYNRULES -- Number of states. */ -#define YYNSTATES 98 +#define YYNSTATES 100 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 276 +#define YYMAXUTOK 277 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -644,9 +671,9 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 24, 2, 2, 25, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 23, 2, - 2, 2, 2, 2, 22, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 25, 2, 2, 26, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 24, 2, + 2, 2, 2, 2, 23, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -667,7 +694,7 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21 + 15, 16, 17, 18, 19, 20, 21, 22 }; #if YYDEBUG @@ -679,53 +706,54 @@ static const yytype_uint8 yyprhs[] = 20, 22, 24, 26, 28, 30, 33, 38, 44, 51, 59, 61, 64, 66, 69, 73, 75, 78, 80, 83, 86, 89, 93, 99, 103, 107, 111, 114, 119, 122, - 126, 129, 131, 134, 137, 139, 142, 145, 147, 150, - 153, 155, 158, 161, 163, 166, 169, 171, 174, 177, - 180, 183, 185, 187, 190, 193, 196, 199, 202, 205, - 207, 209, 211, 213, 215, 217, 219, 222, 223, 226, - 227 + 126, 129, 131, 133, 136, 139, 141, 144, 147, 149, + 152, 155, 157, 160, 163, 165, 168, 171, 173, 176, + 179, 182, 185, 187, 189, 192, 195, 198, 201, 204, + 207, 209, 211, 213, 215, 217, 219, 221, 223, 226, + 227, 230, 231 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 27, 0, -1, 28, -1, 29, -1, 22, 39, -1, - -1, 29, 30, -1, 31, -1, 32, -1, 33, -1, - 35, -1, 34, -1, 36, -1, 42, -1, 43, -1, - 19, 14, -1, 19, 23, 19, 45, -1, 19, 23, - 19, 18, 44, -1, 19, 23, 19, 23, 41, 45, - -1, 19, 23, 19, 23, 41, 18, 44, -1, 13, - -1, 13, 4, -1, 17, -1, 17, 38, -1, 17, - 18, 44, -1, 12, -1, 17, 4, -1, 11, -1, - 11, 24, -1, 16, 11, -1, 19, 11, -1, 19, - 25, 19, -1, 19, 25, 19, 25, 19, -1, 19, - 18, 18, -1, 19, 15, 18, -1, 15, 18, 18, - -1, 15, 19, -1, 15, 19, 24, 19, -1, 19, - 15, -1, 19, 15, 19, -1, 37, 3, -1, 37, - -1, 16, 5, -1, 19, 5, -1, 5, -1, 16, - 6, -1, 19, 6, -1, 6, -1, 16, 10, -1, - 19, 10, -1, 10, -1, 16, 7, -1, 19, 7, - -1, 7, -1, 16, 8, -1, 19, 8, -1, 8, - -1, 16, 9, -1, 19, 9, -1, 20, 9, -1, - 21, 9, -1, 9, -1, 38, -1, 18, 5, -1, - 18, 6, -1, 18, 10, -1, 18, 7, -1, 18, - 8, -1, 18, 9, -1, 40, -1, 41, -1, 20, - -1, 18, -1, 21, -1, 19, -1, 19, -1, 19, - 38, -1, -1, 23, 19, -1, -1, 14, -1 + 28, 0, -1, 29, -1, 30, -1, 23, 41, -1, + -1, 30, 31, -1, 32, -1, 33, -1, 34, -1, + 36, -1, 35, -1, 37, -1, 44, -1, 45, -1, + 20, 15, -1, 20, 24, 20, 47, -1, 20, 24, + 20, 19, 46, -1, 20, 24, 20, 24, 43, 47, + -1, 20, 24, 20, 24, 43, 19, 46, -1, 14, + -1, 14, 4, -1, 18, -1, 18, 39, -1, 18, + 19, 46, -1, 13, -1, 18, 4, -1, 12, -1, + 12, 25, -1, 17, 12, -1, 20, 12, -1, 20, + 26, 20, -1, 20, 26, 20, 26, 20, -1, 20, + 19, 19, -1, 20, 16, 19, -1, 16, 19, 19, + -1, 16, 20, -1, 16, 20, 25, 20, -1, 20, + 16, -1, 20, 16, 20, -1, 38, 3, -1, 38, + -1, 40, -1, 17, 5, -1, 20, 5, -1, 5, + -1, 17, 6, -1, 20, 6, -1, 6, -1, 17, + 10, -1, 20, 10, -1, 10, -1, 17, 7, -1, + 20, 7, -1, 7, -1, 17, 8, -1, 20, 8, + -1, 8, -1, 17, 9, -1, 20, 9, -1, 21, + 9, -1, 22, 9, -1, 9, -1, 39, -1, 19, + 5, -1, 19, 6, -1, 19, 10, -1, 19, 7, + -1, 19, 8, -1, 19, 9, -1, 11, -1, 42, + -1, 43, -1, 21, -1, 19, -1, 22, -1, 20, + -1, 20, -1, 20, 39, -1, -1, 24, 20, -1, + -1, 15, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 287, 287, 288, 292, 299, 301, 305, 307, 309, - 311, 313, 315, 317, 318, 322, 330, 338, 348, 355, - 367, 372, 380, 382, 392, 394, 396, 401, 406, 411, - 416, 424, 429, 449, 456, 464, 472, 477, 483, 488, - 497, 507, 520, 522, 524, 526, 528, 530, 532, 534, - 536, 538, 540, 542, 544, 546, 548, 550, 552, 554, - 556, 558, 560, 564, 566, 568, 570, 572, 574, 578, - 578, 581, 582, 587, 588, 593, 598, 616, 617, 623, - 624 + 0, 312, 312, 313, 317, 324, 326, 330, 332, 334, + 336, 338, 340, 341, 342, 346, 351, 356, 363, 368, + 378, 383, 391, 393, 396, 398, 400, 405, 410, 415, + 420, 428, 433, 453, 460, 468, 476, 481, 487, 492, + 501, 503, 505, 510, 512, 514, 516, 518, 520, 522, + 524, 526, 528, 530, 532, 534, 536, 538, 540, 542, + 544, 546, 548, 550, 554, 556, 558, 560, 562, 564, + 569, 573, 573, 576, 577, 582, 583, 588, 593, 604, + 605, 611, 612 }; #endif @@ -736,12 +764,13 @@ static const char *const yytname[] = { "$end", "error", "$undefined", "tAGO", "tDST", "tYEAR_UNIT", "tMONTH_UNIT", "tHOUR_UNIT", "tMINUTE_UNIT", "tSEC_UNIT", "tDAY_UNIT", - "tDAY", "tDAYZONE", "tLOCAL_ZONE", "tMERIDIAN", "tMONTH", "tORDINAL", - "tZONE", "tSNUMBER", "tUNUMBER", "tSDECIMAL_NUMBER", "tUDECIMAL_NUMBER", - "'@'", "':'", "','", "'/'", "$accept", "spec", "timespec", "items", - "item", "time", "local_zone", "zone", "day", "date", "rel", "relunit", - "relunit_snumber", "seconds", "signed_seconds", "unsigned_seconds", - "number", "hybrid", "o_colon_minutes", "o_merid", 0 + "tDAY_SHIFT", "tDAY", "tDAYZONE", "tLOCAL_ZONE", "tMERIDIAN", "tMONTH", + "tORDINAL", "tZONE", "tSNUMBER", "tUNUMBER", "tSDECIMAL_NUMBER", + "tUDECIMAL_NUMBER", "'@'", "':'", "','", "'/'", "$accept", "spec", + "timespec", "items", "item", "time", "local_zone", "zone", "day", "date", + "rel", "relunit", "relunit_snumber", "dayshift", "seconds", + "signed_seconds", "unsigned_seconds", "number", "hybrid", + "o_colon_minutes", "o_merid", 0 }; #endif @@ -752,22 +781,22 @@ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 64, 58, 44, 47 + 275, 276, 277, 64, 58, 44, 47 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 26, 27, 27, 28, 29, 29, 30, 30, 30, - 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, - 32, 32, 33, 33, 33, 33, 33, 34, 34, 34, - 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, - 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, - 37, 37, 37, 38, 38, 38, 38, 38, 38, 39, - 39, 40, 40, 41, 41, 42, 43, 44, 44, 45, - 45 + 0, 27, 28, 28, 29, 30, 30, 31, 31, 31, + 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, + 33, 33, 34, 34, 34, 34, 34, 35, 35, 35, + 35, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, + 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, + 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, + 40, 41, 41, 42, 42, 43, 43, 44, 45, 46, + 46, 47, 47 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -777,11 +806,11 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 2, 4, 5, 6, 7, 1, 2, 1, 2, 3, 1, 2, 1, 2, 2, 2, 3, 5, 3, 3, 3, 2, 4, 2, 3, + 2, 1, 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, 1, 2, 2, - 1, 2, 2, 1, 2, 2, 1, 2, 2, 2, - 2, 1, 1, 2, 2, 2, 2, 2, 2, 1, - 1, 1, 1, 1, 1, 1, 2, 0, 2, 0, - 1 + 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, + 2, 0, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -789,47 +818,49 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 5, 0, 0, 2, 3, 72, 74, 71, 73, 4, - 69, 70, 1, 44, 47, 53, 56, 61, 50, 27, - 25, 20, 0, 0, 22, 0, 75, 0, 0, 6, - 7, 8, 9, 11, 10, 12, 41, 62, 13, 14, - 28, 21, 0, 36, 42, 45, 51, 54, 57, 48, - 29, 26, 77, 23, 63, 64, 66, 67, 68, 65, - 43, 46, 52, 55, 58, 49, 30, 15, 38, 0, - 0, 0, 76, 59, 60, 40, 35, 0, 0, 24, - 34, 39, 33, 79, 31, 37, 78, 80, 77, 0, - 16, 0, 17, 79, 32, 77, 18, 19 + 5, 0, 0, 2, 3, 74, 76, 73, 75, 4, + 71, 72, 1, 45, 48, 54, 57, 62, 51, 70, + 27, 25, 20, 0, 0, 22, 0, 77, 0, 0, + 6, 7, 8, 9, 11, 10, 12, 41, 63, 42, + 13, 14, 28, 21, 0, 36, 43, 46, 52, 55, + 58, 49, 29, 26, 79, 23, 64, 65, 67, 68, + 69, 66, 44, 47, 53, 56, 59, 50, 30, 15, + 38, 0, 0, 0, 78, 60, 61, 40, 35, 0, + 0, 24, 34, 39, 33, 81, 31, 37, 80, 82, + 79, 0, 16, 0, 17, 81, 32, 79, 18, 19 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 2, 3, 4, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 9, 10, 11, 38, 39, 79, 90 + -1, 2, 3, 4, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 9, 10, 11, 40, 41, 81, + 92 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -81 +#define YYPACT_NINF -82 static const yytype_int8 yypact[] = { - -10, 54, 70, -81, 25, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81, -81, -81, 55, - -81, 74, 50, 48, 10, 56, -5, 71, 72, -81, - -81, -81, -81, -81, -81, -81, 79, -81, -81, -81, - -81, -81, 65, 60, -81, -81, -81, -81, -81, -81, - -81, -81, 16, -81, -81, -81, -81, -81, -81, -81, - -81, -81, -81, -81, -81, -81, -81, -81, 58, 42, - 66, 67, -81, -81, -81, -81, -81, 68, 69, -81, - -81, -81, -81, -7, 64, -81, -81, -81, 73, -2, - -81, 75, -81, 53, -81, 73, -81, -81 + -17, 56, 15, -82, 26, -82, -82, -82, -82, -82, + -82, -82, -82, -82, -82, -82, -82, -82, -82, -82, + 36, -82, 68, 10, 50, 9, 59, -5, 72, 73, + -82, -82, -82, -82, -82, -82, -82, 80, -82, -82, + -82, -82, -82, -82, 65, 61, -82, -82, -82, -82, + -82, -82, -82, -82, 17, -82, -82, -82, -82, -82, + -82, -82, -82, -82, -82, -82, -82, -82, -82, -82, + 60, 44, 67, 69, -82, -82, -82, -82, -82, 70, + 71, -82, -82, -82, -82, -7, 62, -82, -82, -82, + 74, -2, -82, 75, -82, 55, -82, 74, -82, -82 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -81, -81, -81, -81, -81, -81, -81, -81, -81, -81, - -81, -81, 3, -81, -81, 1, -81, -81, -80, -1 + -82, -82, -82, -82, -82, -82, -82, -82, -82, -82, + -82, -82, 46, -82, -82, -82, -6, -82, -82, -81, + -3 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -839,46 +870,46 @@ static const yytype_int8 yypgoto[] = #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 60, 61, 62, 63, 64, 65, 66, 87, 92, 67, - 68, 88, 1, 69, 51, 97, 89, 6, 70, 8, - 71, 54, 55, 56, 57, 58, 59, 53, 52, 72, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 78, - 22, 23, 24, 25, 26, 27, 28, 54, 55, 56, - 57, 58, 59, 44, 45, 46, 47, 48, 49, 50, - 82, 54, 55, 56, 57, 58, 59, 87, 42, 43, - 12, 95, 5, 6, 7, 8, 80, 81, 41, 40, - 73, 74, 75, 76, 77, 83, 84, 85, 86, 91, - 93, 0, 96, 0, 94, 0, 78 + 62, 63, 64, 65, 66, 67, 1, 68, 89, 94, + 69, 70, 90, 53, 71, 12, 99, 91, 6, 72, + 8, 73, 56, 57, 58, 59, 60, 61, 54, 44, + 45, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 80, 23, 24, 25, 26, 27, 28, 29, 56, + 57, 58, 59, 60, 61, 46, 47, 48, 49, 50, + 51, 42, 52, 84, 56, 57, 58, 59, 60, 61, + 89, 55, 43, 74, 97, 5, 6, 7, 8, 82, + 83, 75, 76, 77, 78, 95, 79, 85, 93, 86, + 87, 88, 98, 0, 0, 96, 0, 0, 80 }; static const yytype_int8 yycheck[] = { - 5, 6, 7, 8, 9, 10, 11, 14, 88, 14, - 15, 18, 22, 18, 4, 95, 23, 19, 23, 21, - 25, 5, 6, 7, 8, 9, 10, 24, 18, 26, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 23, - 15, 16, 17, 18, 19, 20, 21, 5, 6, 7, - 8, 9, 10, 5, 6, 7, 8, 9, 10, 11, - 18, 5, 6, 7, 8, 9, 10, 14, 18, 19, - 0, 18, 18, 19, 20, 21, 18, 19, 4, 24, - 9, 9, 3, 18, 24, 19, 19, 19, 19, 25, - 89, -1, 93, -1, 19, -1, 23 + 5, 6, 7, 8, 9, 10, 23, 12, 15, 90, + 15, 16, 19, 4, 19, 0, 97, 24, 20, 24, + 22, 26, 5, 6, 7, 8, 9, 10, 19, 19, + 20, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 24, 16, 17, 18, 19, 20, 21, 22, 5, + 6, 7, 8, 9, 10, 5, 6, 7, 8, 9, + 10, 25, 12, 19, 5, 6, 7, 8, 9, 10, + 15, 25, 4, 27, 19, 19, 20, 21, 22, 19, + 20, 9, 9, 3, 19, 91, 25, 20, 26, 20, + 20, 20, 95, -1, -1, 20, -1, -1, 24 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 22, 27, 28, 29, 18, 19, 20, 21, 39, - 40, 41, 0, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 15, 16, 17, 18, 19, 20, 21, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 42, 43, - 24, 4, 18, 19, 5, 6, 7, 8, 9, 10, - 11, 4, 18, 38, 5, 6, 7, 8, 9, 10, - 5, 6, 7, 8, 9, 10, 11, 14, 15, 18, - 23, 25, 38, 9, 9, 3, 18, 24, 23, 44, - 18, 19, 18, 19, 19, 19, 19, 14, 18, 23, - 45, 25, 44, 41, 19, 18, 45, 44 + 0, 23, 28, 29, 30, 19, 20, 21, 22, 41, + 42, 43, 0, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 16, 17, 18, 19, 20, 21, 22, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 44, 45, 25, 4, 19, 20, 5, 6, 7, 8, + 9, 10, 12, 4, 19, 39, 5, 6, 7, 8, + 9, 10, 5, 6, 7, 8, 9, 10, 12, 15, + 16, 19, 24, 26, 39, 9, 9, 3, 19, 25, + 24, 46, 19, 20, 19, 20, 20, 20, 20, 15, + 19, 24, 47, 26, 46, 43, 20, 19, 47, 46 }; #define yyerrok (yyerrstatus = 0) @@ -1699,7 +1730,7 @@ yyreduce: switch (yyn) { case 4: -#line 293 "getdate.y" +#line 318 "getdate.y" { pc->seconds = (yyvsp[(2) - (2)].timespec); pc->timespec_seen = true; @@ -1707,94 +1738,76 @@ yyreduce: break; case 7: -#line 306 "getdate.y" +#line 331 "getdate.y" { pc->times_seen++; } break; case 8: -#line 308 "getdate.y" +#line 333 "getdate.y" { pc->local_zones_seen++; } break; case 9: -#line 310 "getdate.y" +#line 335 "getdate.y" { pc->zones_seen++; } break; case 10: -#line 312 "getdate.y" +#line 337 "getdate.y" { pc->dates_seen++; } break; case 11: -#line 314 "getdate.y" +#line 339 "getdate.y" { pc->days_seen++; } break; - case 12: -#line 316 "getdate.y" - { pc->rels_seen = true; } - break; - case 15: -#line 323 "getdate.y" +#line 347 "getdate.y" { - pc->hour = (yyvsp[(1) - (2)].textintval).value; - pc->minutes = 0; - pc->seconds.tv_sec = 0; - pc->seconds.tv_nsec = 0; + set_hhmmss (pc, (yyvsp[(1) - (2)].textintval).value, 0, 0, 0); pc->meridian = (yyvsp[(2) - (2)].intval); } break; case 16: -#line 331 "getdate.y" +#line 352 "getdate.y" { - pc->hour = (yyvsp[(1) - (4)].textintval).value; - pc->minutes = (yyvsp[(3) - (4)].textintval).value; - pc->seconds.tv_sec = 0; - pc->seconds.tv_nsec = 0; + set_hhmmss (pc, (yyvsp[(1) - (4)].textintval).value, (yyvsp[(3) - (4)].textintval).value, 0, 0); pc->meridian = (yyvsp[(4) - (4)].intval); } break; case 17: -#line 339 "getdate.y" +#line 357 "getdate.y" { - pc->hour = (yyvsp[(1) - (5)].textintval).value; - pc->minutes = (yyvsp[(3) - (5)].textintval).value; - pc->seconds.tv_sec = 0; - pc->seconds.tv_nsec = 0; + set_hhmmss (pc, (yyvsp[(1) - (5)].textintval).value, (yyvsp[(3) - (5)].textintval).value, 0, 0); pc->meridian = MER24; pc->zones_seen++; - pc->time_zone = time_zone_hhmm ((yyvsp[(4) - (5)].textintval), (yyvsp[(5) - (5)].intval)); + pc->time_zone = time_zone_hhmm (pc, (yyvsp[(4) - (5)].textintval), (yyvsp[(5) - (5)].intval)); } break; case 18: -#line 349 "getdate.y" +#line 364 "getdate.y" { - pc->hour = (yyvsp[(1) - (6)].textintval).value; - pc->minutes = (yyvsp[(3) - (6)].textintval).value; - pc->seconds = (yyvsp[(5) - (6)].timespec); + set_hhmmss (pc, (yyvsp[(1) - (6)].textintval).value, (yyvsp[(3) - (6)].textintval).value, (yyvsp[(5) - (6)].timespec).tv_sec, (yyvsp[(5) - (6)].timespec).tv_nsec); pc->meridian = (yyvsp[(6) - (6)].intval); } break; case 19: -#line 356 "getdate.y" +#line 369 "getdate.y" { - pc->hour = (yyvsp[(1) - (7)].textintval).value; - pc->minutes = (yyvsp[(3) - (7)].textintval).value; - pc->seconds = (yyvsp[(5) - (7)].timespec); + set_hhmmss (pc, (yyvsp[(1) - (7)].textintval).value, (yyvsp[(3) - (7)].textintval).value, (yyvsp[(5) - (7)].timespec).tv_sec, (yyvsp[(5) - (7)].timespec).tv_nsec); pc->meridian = MER24; pc->zones_seen++; - pc->time_zone = time_zone_hhmm ((yyvsp[(6) - (7)].textintval), (yyvsp[(7) - (7)].intval)); + pc->time_zone = time_zone_hhmm (pc, (yyvsp[(6) - (7)].textintval), (yyvsp[(7) - (7)].intval)); } break; case 20: -#line 368 "getdate.y" +#line 379 "getdate.y" { pc->local_isdst = (yyvsp[(1) - (1)].intval); pc->dsts_seen += (0 < (yyvsp[(1) - (1)].intval)); @@ -1802,7 +1815,7 @@ yyreduce: break; case 21: -#line 373 "getdate.y" +#line 384 "getdate.y" { pc->local_isdst = 1; pc->dsts_seen += (0 < (yyvsp[(1) - (2)].intval)) + 1; @@ -1810,40 +1823,33 @@ yyreduce: break; case 22: -#line 381 "getdate.y" +#line 392 "getdate.y" { pc->time_zone = (yyvsp[(1) - (1)].intval); } break; case 23: -#line 383 "getdate.y" +#line 394 "getdate.y" { pc->time_zone = (yyvsp[(1) - (2)].intval); - pc->rel.ns += (yyvsp[(2) - (2)].rel).ns; - pc->rel.seconds += (yyvsp[(2) - (2)].rel).seconds; - pc->rel.minutes += (yyvsp[(2) - (2)].rel).minutes; - pc->rel.hour += (yyvsp[(2) - (2)].rel).hour; - pc->rel.day += (yyvsp[(2) - (2)].rel).day; - pc->rel.month += (yyvsp[(2) - (2)].rel).month; - pc->rel.year += (yyvsp[(2) - (2)].rel).year; - pc->rels_seen = true; } + apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } break; case 24: -#line 393 "getdate.y" - { pc->time_zone = (yyvsp[(1) - (3)].intval) + time_zone_hhmm ((yyvsp[(2) - (3)].textintval), (yyvsp[(3) - (3)].intval)); } +#line 397 "getdate.y" + { pc->time_zone = (yyvsp[(1) - (3)].intval) + time_zone_hhmm (pc, (yyvsp[(2) - (3)].textintval), (yyvsp[(3) - (3)].intval)); } break; case 25: -#line 395 "getdate.y" +#line 399 "getdate.y" { pc->time_zone = (yyvsp[(1) - (1)].intval) + 60; } break; case 26: -#line 397 "getdate.y" +#line 401 "getdate.y" { pc->time_zone = (yyvsp[(1) - (2)].intval) + 60; } break; case 27: -#line 402 "getdate.y" +#line 406 "getdate.y" { pc->day_ordinal = 1; pc->day_number = (yyvsp[(1) - (1)].intval); @@ -1851,7 +1857,7 @@ yyreduce: break; case 28: -#line 407 "getdate.y" +#line 411 "getdate.y" { pc->day_ordinal = 1; pc->day_number = (yyvsp[(1) - (2)].intval); @@ -1859,7 +1865,7 @@ yyreduce: break; case 29: -#line 412 "getdate.y" +#line 416 "getdate.y" { pc->day_ordinal = (yyvsp[(1) - (2)].intval); pc->day_number = (yyvsp[(2) - (2)].intval); @@ -1867,7 +1873,7 @@ yyreduce: break; case 30: -#line 417 "getdate.y" +#line 421 "getdate.y" { pc->day_ordinal = (yyvsp[(1) - (2)].textintval).value; pc->day_number = (yyvsp[(2) - (2)].intval); @@ -1875,7 +1881,7 @@ yyreduce: break; case 31: -#line 425 "getdate.y" +#line 429 "getdate.y" { pc->month = (yyvsp[(1) - (3)].textintval).value; pc->day = (yyvsp[(3) - (3)].textintval).value; @@ -1883,7 +1889,7 @@ yyreduce: break; case 32: -#line 430 "getdate.y" +#line 434 "getdate.y" { /* Interpret as YYYY/MM/DD if the first value has 4 or more digits, otherwise as MM/DD/YY. @@ -1906,7 +1912,7 @@ yyreduce: break; case 33: -#line 450 "getdate.y" +#line 454 "getdate.y" { /* ISO 8601 format. YYYY-MM-DD. */ pc->year = (yyvsp[(1) - (3)].textintval); @@ -1916,7 +1922,7 @@ yyreduce: break; case 34: -#line 457 "getdate.y" +#line 461 "getdate.y" { /* e.g. 17-JUN-1992. */ pc->day = (yyvsp[(1) - (3)].textintval).value; @@ -1927,7 +1933,7 @@ yyreduce: break; case 35: -#line 465 "getdate.y" +#line 469 "getdate.y" { /* e.g. JUN-17-1992. */ pc->month = (yyvsp[(1) - (3)].intval); @@ -1938,7 +1944,7 @@ yyreduce: break; case 36: -#line 473 "getdate.y" +#line 477 "getdate.y" { pc->month = (yyvsp[(1) - (2)].intval); pc->day = (yyvsp[(2) - (2)].textintval).value; @@ -1946,7 +1952,7 @@ yyreduce: break; case 37: -#line 478 "getdate.y" +#line 482 "getdate.y" { pc->month = (yyvsp[(1) - (4)].intval); pc->day = (yyvsp[(2) - (4)].textintval).value; @@ -1955,7 +1961,7 @@ yyreduce: break; case 38: -#line 484 "getdate.y" +#line 488 "getdate.y" { pc->day = (yyvsp[(1) - (2)].textintval).value; pc->month = (yyvsp[(2) - (2)].intval); @@ -1963,7 +1969,7 @@ yyreduce: break; case 39: -#line 489 "getdate.y" +#line 493 "getdate.y" { pc->day = (yyvsp[(1) - (3)].textintval).value; pc->month = (yyvsp[(2) - (3)].intval); @@ -1972,216 +1978,203 @@ yyreduce: break; case 40: -#line 498 "getdate.y" - { - pc->rel.ns -= (yyvsp[(1) - (2)].rel).ns; - pc->rel.seconds -= (yyvsp[(1) - (2)].rel).seconds; - pc->rel.minutes -= (yyvsp[(1) - (2)].rel).minutes; - pc->rel.hour -= (yyvsp[(1) - (2)].rel).hour; - pc->rel.day -= (yyvsp[(1) - (2)].rel).day; - pc->rel.month -= (yyvsp[(1) - (2)].rel).month; - pc->rel.year -= (yyvsp[(1) - (2)].rel).year; - } +#line 502 "getdate.y" + { apply_relative_time (pc, (yyvsp[(1) - (2)].rel), -1); } break; case 41: -#line 508 "getdate.y" - { - pc->rel.ns += (yyvsp[(1) - (1)].rel).ns; - pc->rel.seconds += (yyvsp[(1) - (1)].rel).seconds; - pc->rel.minutes += (yyvsp[(1) - (1)].rel).minutes; - pc->rel.hour += (yyvsp[(1) - (1)].rel).hour; - pc->rel.day += (yyvsp[(1) - (1)].rel).day; - pc->rel.month += (yyvsp[(1) - (1)].rel).month; - pc->rel.year += (yyvsp[(1) - (1)].rel).year; - } +#line 504 "getdate.y" + { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } break; case 42: -#line 521 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].intval); } +#line 506 "getdate.y" + { apply_relative_time (pc, (yyvsp[(1) - (1)].rel), 1); } break; case 43: -#line 523 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } +#line 511 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].intval); } break; case 44: -#line 525 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; } +#line 513 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } break; case 45: -#line 527 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].intval); } +#line 515 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = 1; } break; case 46: -#line 529 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } +#line 517 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].intval); } break; case 47: -#line 531 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; } +#line 519 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } break; case 48: -#line 533 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].intval) * (yyvsp[(2) - (2)].intval); } +#line 521 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = 1; } break; case 49: -#line 535 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } +#line 523 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].intval) * (yyvsp[(2) - (2)].intval); } break; case 50: -#line 537 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } +#line 525 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } break; case 51: -#line 539 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].intval); } +#line 527 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } break; case 52: -#line 541 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } +#line 529 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].intval); } break; case 53: -#line 543 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; } +#line 531 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } break; case 54: -#line 545 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].intval); } +#line 533 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = 1; } break; case 55: -#line 547 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } +#line 535 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].intval); } break; case 56: -#line 549 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; } +#line 537 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } break; case 57: -#line 551 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].intval); } +#line 539 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = 1; } break; case 58: -#line 553 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } +#line 541 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].intval); } break; case 59: -#line 555 "getdate.y" - { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; } +#line 543 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } break; case 60: -#line 557 "getdate.y" +#line 545 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; } break; case 61: -#line 559 "getdate.y" +#line 547 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].timespec).tv_sec; (yyval.rel).ns = (yyvsp[(1) - (2)].timespec).tv_nsec; } + break; + + case 62: +#line 549 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = 1; } break; - case 63: -#line 565 "getdate.y" + case 64: +#line 555 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).year = (yyvsp[(1) - (2)].textintval).value; } break; - case 64: -#line 567 "getdate.y" + case 65: +#line 557 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).month = (yyvsp[(1) - (2)].textintval).value; } break; - case 65: -#line 569 "getdate.y" + case 66: +#line 559 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (2)].textintval).value * (yyvsp[(2) - (2)].intval); } break; - case 66: -#line 571 "getdate.y" + case 67: +#line 561 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).hour = (yyvsp[(1) - (2)].textintval).value; } break; - case 67: -#line 573 "getdate.y" + case 68: +#line 563 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).minutes = (yyvsp[(1) - (2)].textintval).value; } break; - case 68: -#line 575 "getdate.y" + case 69: +#line 565 "getdate.y" { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).seconds = (yyvsp[(1) - (2)].textintval).value; } break; - case 72: -#line 583 "getdate.y" - { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } + case 70: +#line 570 "getdate.y" + { (yyval.rel) = RELATIVE_TIME_0; (yyval.rel).day = (yyvsp[(1) - (1)].intval); } break; case 74: -#line 589 "getdate.y" +#line 578 "getdate.y" { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } break; - case 75: -#line 594 "getdate.y" + case 76: +#line 584 "getdate.y" + { (yyval.timespec).tv_sec = (yyvsp[(1) - (1)].textintval).value; (yyval.timespec).tv_nsec = 0; } + break; + + case 77: +#line 589 "getdate.y" { digits_to_date_time (pc, (yyvsp[(1) - (1)].textintval)); } break; - case 76: -#line 599 "getdate.y" + case 78: +#line 594 "getdate.y" { /* Hybrid all-digit and relative offset, so that we accept e.g., "YYYYMMDD +N days" as well as "YYYYMMDD N days". */ digits_to_date_time (pc, (yyvsp[(1) - (2)].textintval)); - pc->rel.ns += (yyvsp[(2) - (2)].rel).ns; - pc->rel.seconds += (yyvsp[(2) - (2)].rel).seconds; - pc->rel.minutes += (yyvsp[(2) - (2)].rel).minutes; - pc->rel.hour += (yyvsp[(2) - (2)].rel).hour; - pc->rel.day += (yyvsp[(2) - (2)].rel).day; - pc->rel.month += (yyvsp[(2) - (2)].rel).month; - pc->rel.year += (yyvsp[(2) - (2)].rel).year; - pc->rels_seen = true; + apply_relative_time (pc, (yyvsp[(2) - (2)].rel), 1); } break; - case 77: -#line 616 "getdate.y" + case 79: +#line 604 "getdate.y" { (yyval.intval) = -1; } break; - case 78: -#line 618 "getdate.y" + case 80: +#line 606 "getdate.y" { (yyval.intval) = (yyvsp[(2) - (2)].textintval).value; } break; - case 79: -#line 623 "getdate.y" + case 81: +#line 611 "getdate.y" { (yyval.intval) = MER24; } break; - case 80: -#line 625 "getdate.y" + case 82: +#line 613 "getdate.y" { (yyval.intval) = (yyvsp[(1) - (1)].intval); } break; /* Line 1267 of yacc.c. */ -#line 2185 "getdate.c" +#line 2178 "getdate.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2395,7 +2388,7 @@ yyreturn: } -#line 628 "getdate.y" +#line 616 "getdate.y" static table const meridian_table[] = @@ -2459,10 +2452,10 @@ static table const time_units_table[] = /* Assorted relative-time words. */ static table const relative_time_table[] = { - { "TOMORROW", tDAY_UNIT, 1 }, - { "YESTERDAY",tDAY_UNIT, -1 }, - { "TODAY", tDAY_UNIT, 0 }, - { "NOW", tDAY_UNIT, 0 }, + { "TOMORROW", tDAY_SHIFT, 1 }, + { "YESTERDAY",tDAY_SHIFT, -1 }, + { "TODAY", tDAY_SHIFT, 0 }, + { "NOW", tDAY_SHIFT, 0 }, { "LAST", tORDINAL, -1 }, { "THIS", tORDINAL, 0 }, { "NEXT", tORDINAL, 1 }, @@ -2585,15 +2578,33 @@ static table const military_table[] = /* Convert a time zone expressed as HH:MM into an integer count of minutes. If MM is negative, then S is of the form HHMM and needs - to be picked apart; otherwise, S is of the form HH. */ + to be picked apart; otherwise, S is of the form HH. As specified in + http://www.opengroup.org/susv3xbd/xbd_chap08.html#tag_08_03, allow + only valid TZ range, and consider first two digits as hours, if no + minutes specified. */ static long int -time_zone_hhmm (textint s, long int mm) +time_zone_hhmm (parser_control *pc, textint s, long int mm) { + long int n_minutes; + + /* If the length of S is 1 or 2 and no minutes are specified, + interpret it as a number of hours. */ + if (s.digits <= 2 && mm < 0) + s.value *= 100; + if (mm < 0) - return (s.value / 100) * 60 + s.value % 100; + n_minutes = (s.value / 100) * 60 + s.value % 100; else - return s.value * 60 + (s.negative ? -mm : mm); + n_minutes = s.value * 60 + (s.negative ? -mm : mm); + + /* If the absolute number of minutes is larger than 24 hours, + arrange to reject it by incrementing pc->zones_seen. Thus, + we allow only values in the range UTC-24:00 to UTC+24:00. */ + if (24 * 60 < abs (n_minutes)) + pc->zones_seen++; + + return n_minutes; } static int @@ -2690,7 +2701,7 @@ lookup_word (parser_control const *pc, char *word) for (p = word; *p; p++) { unsigned char ch = *p; - *p = toupper (ch); + *p = c_toupper (ch); } for (tp = meridian_table; tp->name; tp++) @@ -2755,7 +2766,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) for (;;) { - while (c = *pc->input, isspace (c)) + while (c = *pc->input, c_isspace (c)) pc->input++; if (ISDIGIT (c) || c == '-' || c == '+') @@ -2766,7 +2777,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) if (c == '-' || c == '+') { sign = c == '-' ? -1 : 1; - while (c = *++pc->input, isspace (c)) + while (c = *++pc->input, c_isspace (c)) continue; if (! ISDIGIT (c)) /* skip the '-' sign */ @@ -2870,7 +2881,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) } } - if (isalpha (c)) + if (c_isalpha (c)) { char buff[20]; char *p = buff; @@ -2882,7 +2893,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) *p++ = c; c = *++pc->input; } - while (isalpha (c) || c == '.'); + while (c_isalpha (c) || c == '.'); *p = '\0'; tp = lookup_word (pc, buff); @@ -2995,7 +3006,7 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) if (! tmp) return false; - while (c = *p, isspace (c)) + while (c = *p, c_isspace (c)) p++; if (strncmp (p, "TZ=\"", 4) == 0) @@ -3207,25 +3218,6 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) goto fail; } - if (pc.zones_seen) - { - long int delta = pc.time_zone * 60; - time_t t1; -#ifdef HAVE_TM_GMTOFF - delta -= tm.tm_gmtoff; -#else - time_t t = Start; - struct tm const *gmt = gmtime (&t); - if (! gmt) - goto fail; - delta -= tm_diff (&tm, gmt); -#endif - t1 = Start - delta; - if ((Start < t1) != (delta < 0)) - goto fail; /* time_t overflow */ - Start = t1; - } - /* Add relative date. */ if (pc.rel.year | pc.rel.month | pc.rel.day) { @@ -3248,6 +3240,27 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) goto fail; } + /* The only "output" of this if-block is an updated Start value, + so this block must follow others that clobber Start. */ + if (pc.zones_seen) + { + long int delta = pc.time_zone * 60; + time_t t1; +#ifdef HAVE_TM_GMTOFF + delta -= tm.tm_gmtoff; +#else + time_t t = Start; + struct tm const *gmt = gmtime (&t); + if (! gmt) + goto fail; + delta -= tm_diff (&tm, gmt); +#endif + t1 = Start - delta; + if ((Start < t1) != (delta < 0)) + goto fail; /* time_t overflow */ + Start = t1; + } + /* Add relative hours, minutes, and seconds. On hosts that support leap seconds, ignore the possibility of leap seconds; e.g., "+ 10 minutes" adds 600 seconds, even if one of them is a diff --git a/lib/getdate.y b/lib/getdate.y index 1deec51..877b264 100644 --- a/lib/getdate.y +++ b/lib/getdate.y @@ -1,8 +1,8 @@ %{ /* Parse a string into an internal time stamp. - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007 Free Software - Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ # undef static #endif -#include +#include #include #include #include @@ -205,7 +205,7 @@ typedef struct union YYSTYPE; static int yylex (union YYSTYPE *, parser_control *); static int yyerror (parser_control const *, char const *); -static long int time_zone_hhmm (textint, long int); +static long int time_zone_hhmm (parser_control *, textint, long int); /* Extract into *PC any date and time info from a string of digits of the form e.g., YYYYMMDD, YYMMDD, HHMM, HH (and sometimes YYY, @@ -246,6 +246,31 @@ digits_to_date_time (parser_control *pc, textint text_int) } } +/* Increment PC->rel by FACTOR * REL (FACTOR is 1 or -1). */ +static void +apply_relative_time (parser_control *pc, relative_time rel, int factor) +{ + pc->rel.ns += factor * rel.ns; + pc->rel.seconds += factor * rel.seconds; + pc->rel.minutes += factor * rel.minutes; + pc->rel.hour += factor * rel.hour; + pc->rel.day += factor * rel.day; + pc->rel.month += factor * rel.month; + pc->rel.year += factor * rel.year; + pc->rels_seen = true; +} + +/* Set PC-> hour, minutes, seconds and nanoseconds members from arguments. */ +static void +set_hhmmss (parser_control *pc, long int hour, long int minutes, + time_t sec, long int nsec) +{ + pc->hour = hour; + pc->minutes = minutes; + pc->seconds.tv_sec = sec; + pc->seconds.tv_nsec = nsec; +} + %} /* We want a reentrant parser, even if the TZ manipulation and the calls to @@ -268,7 +293,7 @@ digits_to_date_time (parser_control *pc, textint text_int) %token tAGO tDST %token tYEAR_UNIT tMONTH_UNIT tHOUR_UNIT tMINUTE_UNIT tSEC_UNIT -%token tDAY_UNIT +%token tDAY_UNIT tDAY_SHIFT %token tDAY tDAYZONE tLOCAL_ZONE tMERIDIAN %token tMONTH tORDINAL tZONE @@ -279,7 +304,7 @@ digits_to_date_time (parser_control *pc, textint text_int) %type o_colon_minutes o_merid %type seconds signed_seconds unsigned_seconds -%type relunit relunit_snumber +%type relunit relunit_snumber dayshift %% @@ -313,7 +338,6 @@ item: | day { pc->days_seen++; } | rel - { pc->rels_seen = true; } | number | hybrid ; @@ -321,45 +345,32 @@ item: time: tUNUMBER tMERIDIAN { - pc->hour = $1.value; - pc->minutes = 0; - pc->seconds.tv_sec = 0; - pc->seconds.tv_nsec = 0; + set_hhmmss (pc, $1.value, 0, 0, 0); pc->meridian = $2; } | tUNUMBER ':' tUNUMBER o_merid { - pc->hour = $1.value; - pc->minutes = $3.value; - pc->seconds.tv_sec = 0; - pc->seconds.tv_nsec = 0; + set_hhmmss (pc, $1.value, $3.value, 0, 0); pc->meridian = $4; } | tUNUMBER ':' tUNUMBER tSNUMBER o_colon_minutes { - pc->hour = $1.value; - pc->minutes = $3.value; - pc->seconds.tv_sec = 0; - pc->seconds.tv_nsec = 0; + set_hhmmss (pc, $1.value, $3.value, 0, 0); pc->meridian = MER24; pc->zones_seen++; - pc->time_zone = time_zone_hhmm ($4, $5); + pc->time_zone = time_zone_hhmm (pc, $4, $5); } | tUNUMBER ':' tUNUMBER ':' unsigned_seconds o_merid { - pc->hour = $1.value; - pc->minutes = $3.value; - pc->seconds = $5; + set_hhmmss (pc, $1.value, $3.value, $5.tv_sec, $5.tv_nsec); pc->meridian = $6; } | tUNUMBER ':' tUNUMBER ':' unsigned_seconds tSNUMBER o_colon_minutes { - pc->hour = $1.value; - pc->minutes = $3.value; - pc->seconds = $5; + set_hhmmss (pc, $1.value, $3.value, $5.tv_sec, $5.tv_nsec); pc->meridian = MER24; pc->zones_seen++; - pc->time_zone = time_zone_hhmm ($6, $7); + pc->time_zone = time_zone_hhmm (pc, $6, $7); } ; @@ -381,16 +392,9 @@ zone: { pc->time_zone = $1; } | tZONE relunit_snumber { pc->time_zone = $1; - pc->rel.ns += $2.ns; - pc->rel.seconds += $2.seconds; - pc->rel.minutes += $2.minutes; - pc->rel.hour += $2.hour; - pc->rel.day += $2.day; - pc->rel.month += $2.month; - pc->rel.year += $2.year; - pc->rels_seen = true; } + apply_relative_time (pc, $2, 1); } | tZONE tSNUMBER o_colon_minutes - { pc->time_zone = $1 + time_zone_hhmm ($2, $3); } + { pc->time_zone = $1 + time_zone_hhmm (pc, $2, $3); } | tDAYZONE { pc->time_zone = $1 + 60; } | tZONE tDST @@ -495,25 +499,11 @@ date: rel: relunit tAGO - { - pc->rel.ns -= $1.ns; - pc->rel.seconds -= $1.seconds; - pc->rel.minutes -= $1.minutes; - pc->rel.hour -= $1.hour; - pc->rel.day -= $1.day; - pc->rel.month -= $1.month; - pc->rel.year -= $1.year; - } + { apply_relative_time (pc, $1, -1); } | relunit - { - pc->rel.ns += $1.ns; - pc->rel.seconds += $1.seconds; - pc->rel.minutes += $1.minutes; - pc->rel.hour += $1.hour; - pc->rel.day += $1.day; - pc->rel.month += $1.month; - pc->rel.year += $1.year; - } + { apply_relative_time (pc, $1, 1); } + | dayshift + { apply_relative_time (pc, $1, 1); } ; relunit: @@ -575,6 +565,11 @@ relunit_snumber: { $$ = RELATIVE_TIME_0; $$.seconds = $1.value; } ; +dayshift: + tDAY_SHIFT + { $$ = RELATIVE_TIME_0; $$.day = $1; } + ; + seconds: signed_seconds | unsigned_seconds; signed_seconds: @@ -600,14 +595,7 @@ hybrid: /* Hybrid all-digit and relative offset, so that we accept e.g., "YYYYMMDD +N days" as well as "YYYYMMDD N days". */ digits_to_date_time (pc, $1); - pc->rel.ns += $2.ns; - pc->rel.seconds += $2.seconds; - pc->rel.minutes += $2.minutes; - pc->rel.hour += $2.hour; - pc->rel.day += $2.day; - pc->rel.month += $2.month; - pc->rel.year += $2.year; - pc->rels_seen = true; + apply_relative_time (pc, $2, 1); } ; @@ -688,10 +676,10 @@ static table const time_units_table[] = /* Assorted relative-time words. */ static table const relative_time_table[] = { - { "TOMORROW", tDAY_UNIT, 1 }, - { "YESTERDAY",tDAY_UNIT, -1 }, - { "TODAY", tDAY_UNIT, 0 }, - { "NOW", tDAY_UNIT, 0 }, + { "TOMORROW", tDAY_SHIFT, 1 }, + { "YESTERDAY",tDAY_SHIFT, -1 }, + { "TODAY", tDAY_SHIFT, 0 }, + { "NOW", tDAY_SHIFT, 0 }, { "LAST", tORDINAL, -1 }, { "THIS", tORDINAL, 0 }, { "NEXT", tORDINAL, 1 }, @@ -814,15 +802,33 @@ static table const military_table[] = /* Convert a time zone expressed as HH:MM into an integer count of minutes. If MM is negative, then S is of the form HHMM and needs - to be picked apart; otherwise, S is of the form HH. */ + to be picked apart; otherwise, S is of the form HH. As specified in + http://www.opengroup.org/susv3xbd/xbd_chap08.html#tag_08_03, allow + only valid TZ range, and consider first two digits as hours, if no + minutes specified. */ static long int -time_zone_hhmm (textint s, long int mm) +time_zone_hhmm (parser_control *pc, textint s, long int mm) { + long int n_minutes; + + /* If the length of S is 1 or 2 and no minutes are specified, + interpret it as a number of hours. */ + if (s.digits <= 2 && mm < 0) + s.value *= 100; + if (mm < 0) - return (s.value / 100) * 60 + s.value % 100; + n_minutes = (s.value / 100) * 60 + s.value % 100; else - return s.value * 60 + (s.negative ? -mm : mm); + n_minutes = s.value * 60 + (s.negative ? -mm : mm); + + /* If the absolute number of minutes is larger than 24 hours, + arrange to reject it by incrementing pc->zones_seen. Thus, + we allow only values in the range UTC-24:00 to UTC+24:00. */ + if (24 * 60 < abs (n_minutes)) + pc->zones_seen++; + + return n_minutes; } static int @@ -919,7 +925,7 @@ lookup_word (parser_control const *pc, char *word) for (p = word; *p; p++) { unsigned char ch = *p; - *p = toupper (ch); + *p = c_toupper (ch); } for (tp = meridian_table; tp->name; tp++) @@ -984,7 +990,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) for (;;) { - while (c = *pc->input, isspace (c)) + while (c = *pc->input, c_isspace (c)) pc->input++; if (ISDIGIT (c) || c == '-' || c == '+') @@ -995,7 +1001,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) if (c == '-' || c == '+') { sign = c == '-' ? -1 : 1; - while (c = *++pc->input, isspace (c)) + while (c = *++pc->input, c_isspace (c)) continue; if (! ISDIGIT (c)) /* skip the '-' sign */ @@ -1099,7 +1105,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) } } - if (isalpha (c)) + if (c_isalpha (c)) { char buff[20]; char *p = buff; @@ -1111,7 +1117,7 @@ yylex (YYSTYPE *lvalp, parser_control *pc) *p++ = c; c = *++pc->input; } - while (isalpha (c) || c == '.'); + while (c_isalpha (c) || c == '.'); *p = '\0'; tp = lookup_word (pc, buff); @@ -1224,7 +1230,7 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) if (! tmp) return false; - while (c = *p, isspace (c)) + while (c = *p, c_isspace (c)) p++; if (strncmp (p, "TZ=\"", 4) == 0) @@ -1436,25 +1442,6 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) goto fail; } - if (pc.zones_seen) - { - long int delta = pc.time_zone * 60; - time_t t1; -#ifdef HAVE_TM_GMTOFF - delta -= tm.tm_gmtoff; -#else - time_t t = Start; - struct tm const *gmt = gmtime (&t); - if (! gmt) - goto fail; - delta -= tm_diff (&tm, gmt); -#endif - t1 = Start - delta; - if ((Start < t1) != (delta < 0)) - goto fail; /* time_t overflow */ - Start = t1; - } - /* Add relative date. */ if (pc.rel.year | pc.rel.month | pc.rel.day) { @@ -1477,6 +1464,27 @@ get_date (struct timespec *result, char const *p, struct timespec const *now) goto fail; } + /* The only "output" of this if-block is an updated Start value, + so this block must follow others that clobber Start. */ + if (pc.zones_seen) + { + long int delta = pc.time_zone * 60; + time_t t1; +#ifdef HAVE_TM_GMTOFF + delta -= tm.tm_gmtoff; +#else + time_t t = Start; + struct tm const *gmt = gmtime (&t); + if (! gmt) + goto fail; + delta -= tm_diff (&tm, gmt); +#endif + t1 = Start - delta; + if ((Start < t1) != (delta < 0)) + goto fail; /* time_t overflow */ + Start = t1; + } + /* Add relative hours, minutes, and seconds. On hosts that support leap seconds, ignore the possibility of leap seconds; e.g., "+ 10 minutes" adds 600 seconds, even if one of them is a diff --git a/lib/getdelim.c b/lib/getdelim.c index 286a460..4cd1c11 100644 --- a/lib/getdelim.c +++ b/lib/getdelim.c @@ -35,13 +35,18 @@ #ifndef SSIZE_MAX # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) #endif -#if !HAVE_FLOCKFILE + +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +# define getc_maybe_unlocked(fp) getc(fp) +#elif !HAVE_FLOCKFILE || !HAVE_FUNLOCKFILE || !HAVE_DECL_GETC_UNLOCKED # undef flockfile -# define flockfile(x) ((void) 0) -#endif -#if !HAVE_FUNLOCKFILE # undef funlockfile +# define flockfile(x) ((void) 0) # define funlockfile(x) ((void) 0) +# define getc_maybe_unlocked(fp) getc(fp) +#else +# define getc_maybe_unlocked(fp) getc_unlocked(fp) #endif /* Read up to (and including) a DELIMITER from FP into *LINEPTR (and @@ -81,7 +86,7 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) { int i; - i = getc (fp); + i = getc_maybe_unlocked (fp); if (i == EOF) { result = -1; diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 0472c12..5792021 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -9,10 +9,11 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libtar --source-base=.#bootmp/lib --m4-base=.#bootmp/m4 --doc-base=.#bootmp/doc --aux-dir=.#bootmp/build-aux --avoid=lock --avoid=size_max --no-libtool --macro-prefix=gl alloca argmatch argp backupfile closeout configmake dirname error exclude exitfail fileblocks fnmatch-gnu fseeko ftruncate full-write getdate getline getopt getpagesize gettext gettime hash human inttostr inttypes lchown localcharset memset mkdtemp modechange obstack quote quotearg rmdir rpmatch safe-read save-cwd savedir setenv snprintf stat-time stdbool stdint stpcpy strdup strerror strtol strtoul timespec unlinkdir unlocked-io utime utimens version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libtar --source-base=.#bootmp/lib --m4-base=.#bootmp/m4 --doc-base=.#bootmp/doc --tests-base=.#bootmp/tests --aux-dir=.#bootmp/build-aux --avoid=lock --avoid=size_max --no-libtool --macro-prefix=gl alloca argmatch argp backupfile closeout configmake dirname error exclude exitfail fileblocks fnmatch-gnu fseeko ftruncate full-write getdate getline getopt getpagesize gettext gettime hash human inttostr inttypes lchown localcharset memset mkdtemp modechange obstack quote quotearg rmdir rpmatch safe-read save-cwd savedir setenv snprintf stat-time stdbool stdint stpcpy strdup strerror strtol strtoul timespec unlinkdir unlocked-io utime utimens version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects +SUBDIRS = noinst_HEADERS = noinst_LIBRARIES = noinst_LTLIBRARIES = @@ -89,6 +90,12 @@ EXTRA_libtar_a_SOURCES += backupfile.c ## end gnulib module backupfile +## begin gnulib module c-ctype + +libtar_a_SOURCES += c-ctype.h c-ctype.c + +## end gnulib module c-ctype + ## begin gnulib module canonicalize-lgpl @@ -116,6 +123,15 @@ EXTRA_libtar_a_SOURCES += chown.c fchown-stub.c ## end gnulib module chown +## begin gnulib module close + + +EXTRA_DIST += close.c + +EXTRA_libtar_a_SOURCES += close.c + +## end gnulib module close + ## begin gnulib module close-stream @@ -190,10 +206,35 @@ CLEANFILES += configmake.h configmake.h-t ## end gnulib module configmake +## begin gnulib module dirent + +BUILT_SOURCES += $(DIRENT_H) + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +dirent.h: dirent.in.h + rm -f $@-t $@ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ + -e 's|@''GNULIB_DIRFD''@|$(GNULIB_DIRFD)|g' \ + -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ + -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ + < $(srcdir)/dirent.in.h; \ + } > $@-t + mv $@-t $@ +MOSTLYCLEANFILES += dirent.h dirent.h-t + +EXTRA_DIST += dirent.in.h + +## end gnulib module dirent + ## begin gnulib module dirfd -EXTRA_DIST += dirfd.c dirfd.h +EXTRA_DIST += dirfd.c EXTRA_libtar_a_SOURCES += dirfd.c @@ -217,6 +258,33 @@ EXTRA_libtar_a_SOURCES += dup2.c ## end gnulib module dup2 +## begin gnulib module errno + +BUILT_SOURCES += $(ERRNO_H) + +# We need the following in order to create when the system +# doesn't have one that is POSIX compliant. +errno.h: errno.in.h + rm -f $@-t $@ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ + -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ + -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ + -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ + -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ + -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ + -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ + < $(srcdir)/errno.in.h; \ + } > $@-t + mv $@-t $@ +MOSTLYCLEANFILES += errno.h errno.h-t + +EXTRA_DIST += errno.in.h + +## end gnulib module errno + ## begin gnulib module error @@ -246,27 +314,22 @@ EXTRA_libtar_a_SOURCES += exitfail.c ## begin gnulib module fchdir -BUILT_SOURCES += $(DIRENT_H) -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -dirent.h: dirent.in.h - rm -f $@-t $@ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ - -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ - < $(srcdir)/dirent.in.h; \ - } > $@-t - mv $@-t $@ -MOSTLYCLEANFILES += dirent.h dirent.h-t - -EXTRA_DIST += dirent.in.h fchdir.c +EXTRA_DIST += fchdir.c EXTRA_libtar_a_SOURCES += fchdir.c ## end gnulib module fchdir +## begin gnulib module fclose + + +EXTRA_DIST += fclose.c + +EXTRA_libtar_a_SOURCES += fclose.c + +## end gnulib module fclose + ## begin gnulib module fcntl BUILT_SOURCES += $(FCNTL_H) @@ -276,7 +339,8 @@ BUILT_SOURCES += $(FCNTL_H) fcntl.h: fcntl.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \ -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ @@ -316,7 +380,8 @@ BUILT_SOURCES += $(FLOAT_H) float.h: float.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \ < $(srcdir)/float.in.h; \ } > $@-t @@ -358,7 +423,7 @@ EXTRA_libtar_a_SOURCES += fpending.c ## begin gnulib module fseeko -EXTRA_DIST += fseeko.c +EXTRA_DIST += fseeko.c stdio-impl.h EXTRA_libtar_a_SOURCES += fseeko.c @@ -536,7 +601,8 @@ inttypes.h: inttypes.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ @@ -651,7 +717,7 @@ EXTRA_libtar_a_SOURCES += lseek.c ## begin gnulib module lstat -EXTRA_DIST += lstat.c lstat.h +EXTRA_DIST += lstat.c EXTRA_libtar_a_SOURCES += lstat.c @@ -775,6 +841,15 @@ EXTRA_libtar_a_SOURCES += obstack.c ## end gnulib module obstack +## begin gnulib module open + + +EXTRA_DIST += open.c + +EXTRA_libtar_a_SOURCES += open.c + +## end gnulib module open + ## begin gnulib module openat @@ -815,6 +890,15 @@ EXTRA_libtar_a_SOURCES += quotearg.c ## end gnulib module quotearg +## begin gnulib module rawmemchr + + +EXTRA_DIST += rawmemchr.c rawmemchr.valgrind + +EXTRA_libtar_a_SOURCES += rawmemchr.c + +## end gnulib module rawmemchr + ## begin gnulib module readlink @@ -953,7 +1037,8 @@ BUILT_SOURCES += $(STDARG_H) stdarg.h: stdarg.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ < $(srcdir)/stdarg.in.h; \ } > $@-t @@ -992,7 +1077,8 @@ stdint.h: stdint.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ @@ -1031,17 +1117,24 @@ BUILT_SOURCES += stdio.h stdio.h: stdio.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ + -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \ -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \ -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \ -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \ -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \ -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \ -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \ -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \ -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \ -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \ + -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \ + -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \ -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \ -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \ -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \ @@ -1049,8 +1142,18 @@ stdio.h: stdio.in.h -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \ -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \ -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \ + -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \ + -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \ + -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \ + -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \ + -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \ + -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \ + -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \ -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \ -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \ + -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \ + -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \ + -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ @@ -1063,6 +1166,8 @@ stdio.h: stdio.in.h -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ + -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ + -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ @@ -1070,16 +1175,20 @@ stdio.h: stdio.in.h -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ + -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ + -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/stdio.in.h; \ } > $@-t mv $@-t $@ MOSTLYCLEANFILES += stdio.h stdio.h-t -EXTRA_DIST += stdio.in.h +EXTRA_DIST += stdio-write.c stdio.in.h + +EXTRA_libtar_a_SOURCES += stdio-write.c ## end gnulib module stdio @@ -1092,26 +1201,41 @@ BUILT_SOURCES += stdlib.h stdlib.h: stdlib.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \ -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \ -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \ + -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \ + -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \ -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \ -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \ + -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \ + -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \ -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \ -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \ + -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \ + -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \ -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ + -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \ + -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ + -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ + -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ + -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ + -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ + -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \ + -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ @@ -1147,7 +1271,7 @@ EXTRA_libtar_a_SOURCES += strcasecmp.c strncasecmp.c ## begin gnulib module strchrnul -EXTRA_DIST += strchrnul.c +EXTRA_DIST += strchrnul.c strchrnul.valgrind EXTRA_libtar_a_SOURCES += strchrnul.c @@ -1187,7 +1311,8 @@ BUILT_SOURCES += string.h string.h: string.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \ -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \ @@ -1206,6 +1331,7 @@ string.h: string.in.h -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \ -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \ -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \ + -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \ -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \ -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \ -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \ @@ -1219,9 +1345,11 @@ string.h: string.in.h -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ + -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ + -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ @@ -1235,8 +1363,10 @@ string.h: string.in.h -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ + -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ + -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ @@ -1259,7 +1389,8 @@ BUILT_SOURCES += strings.h strings.h: strings.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \ -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \ -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \ @@ -1361,11 +1492,16 @@ sys/stat.h: sys_stat.in.h @MKDIR_P@ sys rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \ + -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \ + -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \ + -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ - -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \ + -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ + -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/sys_stat.in.h; \ } > $@-t mv $@-t $@ @@ -1387,7 +1523,8 @@ sys/time.h: sys_time.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ @@ -1409,7 +1546,8 @@ BUILT_SOURCES += $(SYSEXITS_H) sysexits.h: sysexits.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \ < $(srcdir)/sysexits.in.h; \ } > $@-t @@ -1438,7 +1576,8 @@ BUILT_SOURCES += time.h time.h: time.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ @@ -1481,23 +1620,39 @@ unistd.h: unistd.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ + -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \ + -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \ + -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \ -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \ -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \ + -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \ + -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \ + -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \ -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \ -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ + -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ + -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \ + -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ + -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ + -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ + -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \ + -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ @@ -1505,11 +1660,15 @@ unistd.h: unistd.in.h -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ + -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ + -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ + -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/unistd.in.h; \ } > $@-t mv $@-t $@ @@ -1638,10 +1797,12 @@ BUILT_SOURCES += $(WCHAR_H) wchar.h: wchar.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ + -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ @@ -1664,10 +1825,12 @@ wctype.h: wctype.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ - -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \ < $(srcdir)/wctype.in.h; \ } > $@-t mv $@-t $@ @@ -1686,6 +1849,15 @@ EXTRA_libtar_a_SOURCES += wcwidth.c ## end gnulib module wcwidth +## begin gnulib module write + + +EXTRA_DIST += write.c + +EXTRA_libtar_a_SOURCES += write.c + +## end gnulib module write + ## begin gnulib module xalloc diff --git a/lib/inttostr.h b/lib/inttostr.h index aa5820f..a103caf 100644 --- a/lib/inttostr.h +++ b/lib/inttostr.h @@ -23,7 +23,24 @@ #include "intprops.h" -char *offtostr (off_t, char *); -char *imaxtostr (intmax_t, char *); -char *umaxtostr (uintmax_t, char *); -char *uinttostr (unsigned int, char *); +#ifndef __GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +# else +# define __GNUC_PREREQ(maj, min) 0 +# endif +#endif + +#if __GNUC_PREREQ (3,4) +# undef __attribute_warn_unused_result__ +# define __attribute_warn_unused_result__ \ + __attribute__ ((__warn_unused_result__)) +#else +# define __attribute_warn_unused_result__ /* empty */ +#endif + +char *offtostr (off_t, char *) __attribute_warn_unused_result__; +char *imaxtostr (intmax_t, char *) __attribute_warn_unused_result__; +char *umaxtostr (uintmax_t, char *) __attribute_warn_unused_result__; +char *uinttostr (unsigned int, char *) __attribute_warn_unused_result__; diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 8a24850..bd9d0d2 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2007 Free Software Foundation, Inc. +/* Copyright (C) 2006-2008 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -26,6 +26,9 @@ The include_next requires a split double-inclusion guard. */ #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H # if @HAVE_INTTYPES_H@ +# if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +# endif # @INCLUDE_NEXT@ @NEXT_INTTYPES_H@ # endif #endif diff --git a/lib/localcharset.c b/lib/localcharset.c index 9785370..f49d75b 100644 --- a/lib/localcharset.c +++ b/lib/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 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,7 +36,9 @@ #if defined __EMX__ /* Assume EMX program runs on OS/2, even if compiled under DOS. */ -# define OS2 +# ifndef OS2 +# define OS2 +# endif #endif #if !defined WIN32_NATIVE diff --git a/lib/lstat.c b/lib/lstat.c index 9dcb4cd..3e07270 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -1,7 +1,6 @@ /* Work around a bug of lstat on some systems - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free - Software Foundation, Inc. + Copyright (C) 1997-1999, 2000-2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,13 +19,21 @@ #include -/* The specification of these functions is in sys_stat.h. But we cannot - include this include file here, because on some systems, a - "#define lstat lstat64" is being used, and sys_stat.h deletes this - definition. */ - +/* Get the original definition of open. It might be defined as a macro. */ +#define __need_system_sys_stat_h #include #include +#undef __need_system_sys_stat_h + +static inline int +orig_lstat (const char *filename, struct stat *buf) +{ + return lstat (filename, buf); +} + +/* Specification. */ +#include + #include #include @@ -47,7 +54,7 @@ int rpl_lstat (const char *file, struct stat *sbuf) { size_t len; - int lstat_result = lstat (file, sbuf); + int lstat_result = orig_lstat (file, sbuf); if (lstat_result != 0 || !S_ISLNK (sbuf->st_mode)) return lstat_result; diff --git a/lib/memchr.c b/lib/memchr.c index b47eaef..2253d2d 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2006 Free - Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2006, 2008 + Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), with help from Dan Sahlin (dan@sics.se) and @@ -45,155 +45,127 @@ along with this program. If not, see . */ # define BP_SYM(sym) sym #endif -#undef memchr #undef __memchr +#ifdef _LIBC +# undef memchr +#endif + +#ifndef weak_alias +# define __memchr memchr +#endif /* Search no more than N bytes of S for C. */ void * __memchr (void const *s, int c_in, size_t n) { + /* On 32-bit hardware, choosing longword to be a 32-bit unsigned + long instead of a 64-bit uintmax_t tends to give better + performance. On 64-bit hardware, unsigned long is generally 64 + bits already. Change this typedef to experiment with + performance. */ + typedef unsigned long int longword; + const unsigned char *char_ptr; - const unsigned long int *longword_ptr; - unsigned long int longword, magic_bits, charmask; + const longword *longword_ptr; + longword repeated_one; + longword repeated_c; unsigned reg_char c; - int i; c = (unsigned char) c_in; - /* Handle the first few characters by reading one character at a time. + /* Handle the first few bytes by reading one byte at a time. Do this until CHAR_PTR is aligned on a longword boundary. */ for (char_ptr = (const unsigned char *) s; - n > 0 && (size_t) char_ptr % sizeof longword != 0; + n > 0 && (size_t) char_ptr % sizeof (longword) != 0; --n, ++char_ptr) if (*char_ptr == c) return (void *) char_ptr; + longword_ptr = (const longword *) char_ptr; + /* All these elucidatory comments refer to 4-byte longwords, but the theory applies equally well to any size longwords. */ - longword_ptr = (const unsigned long int *) char_ptr; - - /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits - the "holes." Note that there is a hole just to the left of - each byte, with an extra at the end: - - bits: 01111110 11111110 11111110 11111111 - bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD - - The 1-bits make sure that carries propagate to the next 0-bit. - The 0-bits provide holes for carries to fall into. */ - - /* Set MAGIC_BITS to be this pattern of 1 and 0 bits. - Set CHARMASK to be a longword, each of whose bytes is C. */ - - magic_bits = 0xfefefefe; - charmask = c | (c << 8); - charmask |= charmask << 16; -#if 0xffffffffU < ULONG_MAX - magic_bits |= magic_bits << 32; - charmask |= charmask << 32; - if (8 < sizeof longword) - for (i = 64; i < sizeof longword * 8; i *= 2) - { - magic_bits |= magic_bits << i; - charmask |= charmask << i; - } -#endif - magic_bits = (ULONG_MAX >> 1) & (magic_bits | 1); - - /* Instead of the traditional loop which tests each character, - we will test a longword at a time. The tricky part is testing - if *any of the four* bytes in the longword in question are zero. */ - while (n >= sizeof longword) + /* Compute auxiliary longword values: + repeated_one is a value which has a 1 in every byte. + repeated_c has c in every byte. */ + repeated_one = 0x01010101; + repeated_c = c | (c << 8); + repeated_c |= repeated_c << 16; + if (0xffffffffU < (longword) -1) { - /* We tentatively exit the loop if adding MAGIC_BITS to - LONGWORD fails to change any of the hole bits of LONGWORD. - - 1) Is this safe? Will it catch all the zero bytes? - Suppose there is a byte with all zeros. Any carry bits - propagating from its left will fall into the hole at its - least significant bit and stop. Since there will be no - carry from its most significant bit, the LSB of the - byte to the left will be unchanged, and the zero will be - detected. - - 2) Is this worthwhile? Will it ignore everything except - zero bytes? Suppose every byte of LONGWORD has a bit set - somewhere. There will be a carry into bit 8. If bit 8 - is set, this will carry into bit 16. If bit 8 is clear, - one of bits 9-15 must be set, so there will be a carry - into bit 16. Similarly, there will be a carry into bit - 24. If one of bits 24-30 is set, there will be a carry - into bit 31, so all of the hole bits will be changed. - - The one misfire occurs when bits 24-30 are clear and bit - 31 is set; in this case, the hole at bit 31 is not - changed. If we had access to the processor carry flag, - we could close this loophole by putting the fourth hole - at bit 32! - - So it ignores everything except 128's, when they're aligned - properly. - - 3) But wait! Aren't we looking for C, not zero? - Good point. So what we do is XOR LONGWORD with a longword, - each of whose bytes is C. This turns each byte that is C - into a zero. */ - - longword = *longword_ptr++ ^ charmask; - - /* Add MAGIC_BITS to LONGWORD. */ - if ((((longword + magic_bits) - - /* Set those bits that were unchanged by the addition. */ - ^ ~longword) - - /* Look at only the hole bits. If any of the hole bits - are unchanged, most likely one of the bytes was a - zero. */ - & ~magic_bits) != 0) + repeated_one |= repeated_one << 31 << 1; + repeated_c |= repeated_c << 31 << 1; + if (8 < sizeof (longword)) { - /* Which of the bytes was C? If none of them were, it was - a misfire; continue the search. */ - - const unsigned char *cp = (const unsigned char *) (longword_ptr - 1); - - if (cp[0] == c) - return (void *) cp; - if (cp[1] == c) - return (void *) &cp[1]; - if (cp[2] == c) - return (void *) &cp[2]; - if (cp[3] == c) - return (void *) &cp[3]; - if (4 < sizeof longword && cp[4] == c) - return (void *) &cp[4]; - if (5 < sizeof longword && cp[5] == c) - return (void *) &cp[5]; - if (6 < sizeof longword && cp[6] == c) - return (void *) &cp[6]; - if (7 < sizeof longword && cp[7] == c) - return (void *) &cp[7]; - if (8 < sizeof longword) - for (i = 8; i < sizeof longword; i++) - if (cp[i] == c) - return (void *) &cp[i]; + size_t i; + + for (i = 64; i < sizeof (longword) * 8; i *= 2) + { + repeated_one |= repeated_one << i; + repeated_c |= repeated_c << i; + } } + } - n -= sizeof longword; + /* Instead of the traditional loop which tests each byte, we will test a + longword at a time. The tricky part is testing if *any of the four* + bytes in the longword in question are equal to c. We first use an xor + with repeated_c. This reduces the task to testing whether *any of the + four* bytes in longword1 is zero. + + We compute tmp = + ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). + That is, we perform the following operations: + 1. Subtract repeated_one. + 2. & ~longword1. + 3. & a mask consisting of 0x80 in every byte. + Consider what happens in each byte: + - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, + and step 3 transforms it into 0x80. A carry can also be propagated + to more significant bytes. + - If a byte of longword1 is nonzero, let its lowest 1 bit be at + position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, + the byte ends in a single bit of value 0 and k bits of value 1. + After step 2, the result is just k bits of value 1: 2^k - 1. After + step 3, the result is 0. And no carry is produced. + So, if longword1 has only non-zero bytes, tmp is zero. + Whereas if longword1 has a zero byte, call j the position of the least + significant zero byte. Then the result has a zero at positions 0, ..., + j-1 and a 0x80 at position j. We cannot predict the result at the more + significant bytes (positions j+1..3), but it does not matter since we + already have a non-zero bit at position 8*j+7. + + So, the test whether any byte in longword1 is zero is equivalent to + testing whether tmp is nonzero. */ + + while (n >= sizeof (longword)) + { + longword longword1 = *longword_ptr ^ repeated_c; + + if ((((longword1 - repeated_one) & ~longword1) + & (repeated_one << 7)) != 0) + break; + longword_ptr++; + n -= sizeof (longword); } char_ptr = (const unsigned char *) longword_ptr; - while (n-- > 0) + /* At this point, we know that either n < sizeof (longword), or one of the + sizeof (longword) bytes starting at char_ptr is == c. On little-endian + machines, we could determine the first such byte without any further + memory accesses, just by looking at the tmp result from the last loop + iteration. But this does not work on big-endian machines. Choose code + that works in both cases. */ + + for (; n > 0; --n, ++char_ptr) { if (*char_ptr == c) return (void *) char_ptr; - else - ++char_ptr; } - return 0; + return NULL; } #ifdef weak_alias weak_alias (__memchr, BP_SYM (memchr)) diff --git a/lib/memrchr.c b/lib/memrchr.c index 50b27c0..da93ca0 100644 --- a/lib/memrchr.c +++ b/lib/memrchr.c @@ -1,7 +1,7 @@ /* memrchr -- find the last occurrence of a byte in a memory block Copyright (C) 1991, 1993, 1996, 1997, 1999, 2000, 2003, 2004, 2005, - 2006, 2007 Free Software Foundation, Inc. + 2006, 2007, 2008 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), with help from Dan Sahlin (dan@sics.se) and @@ -33,7 +33,9 @@ #include #undef __memrchr -#undef memrchr +#ifdef _LIBC +# undef memrchr +#endif #ifndef weak_alias # define __memrchr memrchr @@ -43,146 +45,116 @@ void * __memrchr (void const *s, int c_in, size_t n) { + /* On 32-bit hardware, choosing longword to be a 32-bit unsigned + long instead of a 64-bit uintmax_t tends to give better + performance. On 64-bit hardware, unsigned long is generally 64 + bits already. Change this typedef to experiment with + performance. */ + typedef unsigned long int longword; + const unsigned char *char_ptr; - const unsigned long int *longword_ptr; - unsigned long int longword, magic_bits, charmask; + const longword *longword_ptr; + longword repeated_one; + longword repeated_c; unsigned reg_char c; - int i; c = (unsigned char) c_in; - /* Handle the last few characters by reading one character at a time. + /* Handle the last few bytes by reading one byte at a time. Do this until CHAR_PTR is aligned on a longword boundary. */ for (char_ptr = (const unsigned char *) s + n; - n > 0 && (size_t) char_ptr % sizeof longword != 0; + n > 0 && (size_t) char_ptr % sizeof (longword) != 0; --n) if (*--char_ptr == c) return (void *) char_ptr; + longword_ptr = (const longword *) char_ptr; + /* All these elucidatory comments refer to 4-byte longwords, but the theory applies equally well to any size longwords. */ - longword_ptr = (const unsigned long int *) char_ptr; - - /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits - the "holes." Note that there is a hole just to the left of - each byte, with an extra at the end: - - bits: 01111110 11111110 11111110 11111111 - bytes: AAAAAAAA BBBBBBBB CCCCCCCC DDDDDDDD - - The 1-bits make sure that carries propagate to the next 0-bit. - The 0-bits provide holes for carries to fall into. */ - - /* Set MAGIC_BITS to be this pattern of 1 and 0 bits. - Set CHARMASK to be a longword, each of whose bytes is C. */ - - magic_bits = 0xfefefefe; - charmask = c | (c << 8); - charmask |= charmask << 16; -#if 0xffffffffU < ULONG_MAX - magic_bits |= magic_bits << 32; - charmask |= charmask << 32; - if (8 < sizeof longword) - for (i = 64; i < sizeof longword * 8; i *= 2) - { - magic_bits |= magic_bits << i; - charmask |= charmask << i; - } -#endif - magic_bits = (ULONG_MAX >> 1) & (magic_bits | 1); - - /* Instead of the traditional loop which tests each character, - we will test a longword at a time. The tricky part is testing - if *any of the four* bytes in the longword in question are zero. */ - while (n >= sizeof longword) + /* Compute auxiliary longword values: + repeated_one is a value which has a 1 in every byte. + repeated_c has c in every byte. */ + repeated_one = 0x01010101; + repeated_c = c | (c << 8); + repeated_c |= repeated_c << 16; + if (0xffffffffU < (longword) -1) { - /* We tentatively exit the loop if adding MAGIC_BITS to - LONGWORD fails to change any of the hole bits of LONGWORD. - - 1) Is this safe? Will it catch all the zero bytes? - Suppose there is a byte with all zeros. Any carry bits - propagating from its left will fall into the hole at its - least significant bit and stop. Since there will be no - carry from its most significant bit, the LSB of the - byte to the left will be unchanged, and the zero will be - detected. - - 2) Is this worthwhile? Will it ignore everything except - zero bytes? Suppose every byte of LONGWORD has a bit set - somewhere. There will be a carry into bit 8. If bit 8 - is set, this will carry into bit 16. If bit 8 is clear, - one of bits 9-15 must be set, so there will be a carry - into bit 16. Similarly, there will be a carry into bit - 24. If one of bits 24-30 is set, there will be a carry - into bit 31, so all of the hole bits will be changed. - - The one misfire occurs when bits 24-30 are clear and bit - 31 is set; in this case, the hole at bit 31 is not - changed. If we had access to the processor carry flag, - we could close this loophole by putting the fourth hole - at bit 32! - - So it ignores everything except 128's, when they're aligned - properly. - - 3) But wait! Aren't we looking for C, not zero? - Good point. So what we do is XOR LONGWORD with a longword, - each of whose bytes is C. This turns each byte that is C - into a zero. */ - - longword = *--longword_ptr ^ charmask; - - /* Add MAGIC_BITS to LONGWORD. */ - if ((((longword + magic_bits) - - /* Set those bits that were unchanged by the addition. */ - ^ ~longword) - - /* Look at only the hole bits. If any of the hole bits - are unchanged, most likely one of the bytes was a - zero. */ - & ~magic_bits) != 0) + repeated_one |= repeated_one << 31 << 1; + repeated_c |= repeated_c << 31 << 1; + if (8 < sizeof (longword)) { - /* Which of the bytes was C? If none of them were, it was - a misfire; continue the search. */ - - const unsigned char *cp = (const unsigned char *) longword_ptr; - - if (8 < sizeof longword) - for (i = sizeof longword - 1; 8 <= i; i--) - if (cp[i] == c) - return (void *) &cp[i]; - if (7 < sizeof longword && cp[7] == c) - return (void *) &cp[7]; - if (6 < sizeof longword && cp[6] == c) - return (void *) &cp[6]; - if (5 < sizeof longword && cp[5] == c) - return (void *) &cp[5]; - if (4 < sizeof longword && cp[4] == c) - return (void *) &cp[4]; - if (cp[3] == c) - return (void *) &cp[3]; - if (cp[2] == c) - return (void *) &cp[2]; - if (cp[1] == c) - return (void *) &cp[1]; - if (cp[0] == c) - return (void *) cp; + size_t i; + + for (i = 64; i < sizeof (longword) * 8; i *= 2) + { + repeated_one |= repeated_one << i; + repeated_c |= repeated_c << i; + } } + } + + /* Instead of the traditional loop which tests each byte, we will test a + longword at a time. The tricky part is testing if *any of the four* + bytes in the longword in question are equal to c. We first use an xor + with repeated_c. This reduces the task to testing whether *any of the + four* bytes in longword1 is zero. + + We compute tmp = + ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). + That is, we perform the following operations: + 1. Subtract repeated_one. + 2. & ~longword1. + 3. & a mask consisting of 0x80 in every byte. + Consider what happens in each byte: + - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, + and step 3 transforms it into 0x80. A carry can also be propagated + to more significant bytes. + - If a byte of longword1 is nonzero, let its lowest 1 bit be at + position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, + the byte ends in a single bit of value 0 and k bits of value 1. + After step 2, the result is just k bits of value 1: 2^k - 1. After + step 3, the result is 0. And no carry is produced. + So, if longword1 has only non-zero bytes, tmp is zero. + Whereas if longword1 has a zero byte, call j the position of the least + significant zero byte. Then the result has a zero at positions 0, ..., + j-1 and a 0x80 at position j. We cannot predict the result at the more + significant bytes (positions j+1..3), but it does not matter since we + already have a non-zero bit at position 8*j+7. + + So, the test whether any byte in longword1 is zero is equivalent to + testing whether tmp is nonzero. */ + + while (n >= sizeof (longword)) + { + longword longword1 = *--longword_ptr ^ repeated_c; - n -= sizeof longword; + if ((((longword1 - repeated_one) & ~longword1) + & (repeated_one << 7)) != 0) + { + longword_ptr++; + break; + } + n -= sizeof (longword); } char_ptr = (const unsigned char *) longword_ptr; + /* At this point, we know that either n < sizeof (longword), or one of the + sizeof (longword) bytes starting at char_ptr is == c. On little-endian + machines, we could determine the first such byte without any further + memory accesses, just by looking at the tmp result from the last loop + iteration. But this does not work on big-endian machines. Choose code + that works in both cases. */ + while (n-- > 0) { if (*--char_ptr == c) return (void *) char_ptr; } - return 0; + return NULL; } #ifdef weak_alias weak_alias (__memrchr, memrchr) diff --git a/lib/mktime.c b/lib/mktime.c index 045f7d2..776a48a 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -292,7 +292,9 @@ __mktime_internal (struct tm *tp, int mday = tp->tm_mday; int mon = tp->tm_mon; int year_requested = tp->tm_year; - int isdst = tp->tm_isdst; + /* Normalize the value. */ + int isdst = ((tp->tm_isdst >> (8 * sizeof (tp->tm_isdst) - 1)) + | (tp->tm_isdst != 0)); /* 1 if the previous probe was DST. */ int dst2; diff --git a/lib/open-safer.c b/lib/open-safer.c index ce493d5..15bf6a6 100644 --- a/lib/open-safer.c +++ b/lib/open-safer.c @@ -1,6 +1,6 @@ /* Invoke open, but avoid some glitches. - Copyright (C) 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,9 +38,10 @@ open_safer (char const *file, int flags, ...) /* Assume mode_t promotes to int if and only if it is smaller. This assumption isn't guaranteed by the C standard, but we don't know of any real-world counterexamples. */ - mode = (sizeof (mode_t) < sizeof (int) - ? va_arg (ap, int) - : va_arg (ap, mode_t)); + if (sizeof (mode_t) < sizeof (int)) + mode = va_arg (ap, int); + else + mode = va_arg (ap, mode_t); va_end (ap); } diff --git a/lib/open.c b/lib/open.c new file mode 100644 index 0000000..13af274 --- /dev/null +++ b/lib/open.c @@ -0,0 +1,140 @@ +/* Open a descriptor to a file. + Copyright (C) 2007-2008 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 , 2007. */ + +#include + +/* Get the original definition of open. It might be defined as a macro. */ +#define __need_system_fcntl_h +#include +#undef __need_system_fcntl_h +#include + +static inline int +orig_open (const char *filename, int flags, mode_t mode) +{ + return open (filename, flags, mode); +} + +/* Specification. */ +#include + +#include +#include +#include +#include +#include + +int +open (const char *filename, int flags, ...) +{ + mode_t mode; + int fd; + + mode = 0; + if (flags & O_CREAT) + { + va_list arg; + va_start (arg, flags); + + /* If mode_t is narrower than int, use the promoted type (int), + not mode_t. Use sizeof to guess whether mode_t is narrower; + we don't know of any practical counterexamples. */ + mode = (sizeof (mode_t) < sizeof (int) + ? va_arg (arg, int) + : va_arg (arg, mode_t)); + + va_end (arg); + } + +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + if (strcmp (filename, "/dev/null") == 0) + filename = "NUL"; +#endif + +#if OPEN_TRAILING_SLASH_BUG + /* If the filename ends in a slash and one of O_CREAT, O_WRONLY, O_RDWR + is specified, then fail. + Rationale: POSIX + says that + "A pathname that contains at least one non-slash character and that + ends with one or more trailing slashes shall be resolved as if a + single dot character ( '.' ) were appended to the pathname." + and + "The special filename dot shall refer to the directory specified by + its predecessor." + If the named file already exists as a directory, then + - if O_CREAT is specified, open() must fail because of the semantics + of O_CREAT, + - if O_WRONLY or O_RDWR is specified, open() must fail because POSIX + says that it + fails with errno = EISDIR in this case. + If the named file does not exist or does not name a directory, then + - if O_CREAT is specified, open() must fail since open() cannot create + directories, + - if O_WRONLY or O_RDWR is specified, open() must fail because the + file does not contain a '.' directory. */ + if (flags & (O_CREAT | O_WRONLY | O_RDWR)) + { + size_t len = strlen (filename); + if (len > 0 && filename[len - 1] == '/') + { + errno = EISDIR; + return -1; + } + } +#endif + + fd = orig_open (filename, flags, mode); + +#if OPEN_TRAILING_SLASH_BUG + /* If the filename ends in a slash and fd does not refer to a directory, + then fail. + Rationale: POSIX + says that + "A pathname that contains at least one non-slash character and that + ends with one or more trailing slashes shall be resolved as if a + single dot character ( '.' ) were appended to the pathname." + and + "The special filename dot shall refer to the directory specified by + its predecessor." + If the named file without the slash is not a directory, open() must fail + with ENOTDIR. */ + if (fd >= 0) + { + size_t len = strlen (filename); + if (len > 0 && filename[len - 1] == '/') + { + struct stat statbuf; + + if (fstat (fd, &statbuf) >= 0 && !S_ISDIR (statbuf.st_mode)) + { + close (fd); + errno = ENOTDIR; + return -1; + } + } + } +#endif + +#ifdef FCHDIR_REPLACEMENT + if (fd >= 0) + _gl_register_fd (fd, filename); +#endif + + return fd; +} diff --git a/lib/openat-die.c b/lib/openat-die.c index 6bc533d..81498ae 100644 --- a/lib/openat-die.c +++ b/lib/openat-die.c @@ -1,6 +1,6 @@ /* Report a save- or restore-cwd failure in our openat replacement and then exit. - Copyright (C) 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ #include +#include "openat.h" + #include #include "error.h" @@ -27,9 +29,9 @@ #define N_(msgid) msgid void -openat_save_fail (int errno) +openat_save_fail (int errnum) { - error (exit_failure, errno, + error (exit_failure, errnum, _("unable to record current working directory")); /* The `noreturn' attribute cannot be applied to error, since it returns @@ -40,9 +42,9 @@ openat_save_fail (int errno) } void -openat_restore_fail (int errno) +openat_restore_fail (int errnum) { - error (exit_failure, errno, + error (exit_failure, errnum, _("failed to return to initial working directory")); /* As above. */ diff --git a/lib/openat.c b/lib/openat.c index 73f24b0..0c32672 100644 --- a/lib/openat.c +++ b/lib/openat.c @@ -1,5 +1,5 @@ /* provide a replacement openat function - Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,10 +22,10 @@ #include #include +#include #include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "fcntl--.h" -#include "lstat.h" #include "openat-priv.h" #include "save-cwd.h" diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c new file mode 100644 index 0000000..d7cdc6e --- /dev/null +++ b/lib/rawmemchr.c @@ -0,0 +1,136 @@ +/* Searching in a string. + Copyright (C) 2008 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +/* Find the first occurrence of C in S. */ +void * +rawmemchr (const void *s, int c_in) +{ + /* On 32-bit hardware, choosing longword to be a 32-bit unsigned + long instead of a 64-bit uintmax_t tends to give better + performance. On 64-bit hardware, unsigned long is generally 64 + bits already. Change this typedef to experiment with + performance. */ + typedef unsigned long int longword; + + const unsigned char *char_ptr; + const longword *longword_ptr; + longword repeated_one; + longword repeated_c; + unsigned char c; + + c = (unsigned char) c_in; + + /* Handle the first few bytes by reading one byte at a time. + Do this until CHAR_PTR is aligned on a longword boundary. */ + for (char_ptr = (const unsigned char *) s; + (size_t) char_ptr % sizeof (longword) != 0; + ++char_ptr) + if (*char_ptr == c) + return (void *) char_ptr; + + longword_ptr = (const longword *) char_ptr; + + /* All these elucidatory comments refer to 4-byte longwords, + but the theory applies equally well to any size longwords. */ + + /* Compute auxiliary longword values: + repeated_one is a value which has a 1 in every byte. + repeated_c has c in every byte. */ + repeated_one = 0x01010101; + repeated_c = c | (c << 8); + repeated_c |= repeated_c << 16; + if (0xffffffffU < (longword) -1) + { + repeated_one |= repeated_one << 31 << 1; + repeated_c |= repeated_c << 31 << 1; + if (8 < sizeof (longword)) + { + size_t i; + + for (i = 64; i < sizeof (longword) * 8; i *= 2) + { + repeated_one |= repeated_one << i; + repeated_c |= repeated_c << i; + } + } + } + + /* Instead of the traditional loop which tests each byte, we will + test a longword at a time. The tricky part is testing if *any of + the four* bytes in the longword in question are equal to NUL or + c. We first use an xor with repeated_c. This reduces the task + to testing whether *any of the four* bytes in longword1 is zero. + + We compute tmp = + ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). + That is, we perform the following operations: + 1. Subtract repeated_one. + 2. & ~longword1. + 3. & a mask consisting of 0x80 in every byte. + Consider what happens in each byte: + - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, + and step 3 transforms it into 0x80. A carry can also be propagated + to more significant bytes. + - If a byte of longword1 is nonzero, let its lowest 1 bit be at + position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, + the byte ends in a single bit of value 0 and k bits of value 1. + After step 2, the result is just k bits of value 1: 2^k - 1. After + step 3, the result is 0. And no carry is produced. + So, if longword1 has only non-zero bytes, tmp is zero. + Whereas if longword1 has a zero byte, call j the position of the least + significant zero byte. Then the result has a zero at positions 0, ..., + j-1 and a 0x80 at position j. We cannot predict the result at the more + significant bytes (positions j+1..3), but it does not matter since we + already have a non-zero bit at position 8*j+7. + + The test whether any byte in longword1 is zero is equivalent + to testing whether tmp is nonzero. + + This test can read beyond the end of a string, depending on where + C_IN is encountered. However, this is considered safe since the + initialization phase ensured that the read will be aligned, + therefore, the read will not cross page boundaries and will not + cause a fault. */ + + while (1) + { + longword longword1 = *longword_ptr ^ repeated_c; + + if ((((longword1 - repeated_one) & ~longword1) + & (repeated_one << 7)) != 0) + break; + longword_ptr++; + } + + char_ptr = (const unsigned char *) longword_ptr; + + /* At this point, we know that one of the sizeof (longword) bytes + starting at char_ptr is == c. On little-endian machines, we + could determine the first such byte without any further memory + accesses, just by looking at the tmp result from the last loop + iteration. But this does not work on big-endian machines. + Choose code that works in both cases. */ + + char_ptr = (unsigned char *) longword_ptr; + while (*char_ptr != c) + char_ptr++; + return (void *) char_ptr; +} diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind new file mode 100644 index 0000000..6363923 --- /dev/null +++ b/lib/rawmemchr.valgrind @@ -0,0 +1,12 @@ +# Suppress a valgrind message about use of uninitialized memory in rawmemchr(). +# This use is OK because it provides only a speedup. +{ + rawmemchr-value4 + Memcheck:Value4 + fun:rawmemchr +} +{ + rawmemchr-value8 + Memcheck:Value8 + fun:rawmemchr +} diff --git a/lib/regcomp.c b/lib/regcomp.c index 5ef1c72..49a8b48 100644 --- a/lib/regcomp.c +++ b/lib/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,2003,2004,2005,2006,2007 Free Software Foundation, Inc. + Copyright (C) 2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -778,7 +778,7 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length, __libc_lock_init (dfa->lock); err = re_string_construct (®exp, pattern, length, preg->translate, - syntax & RE_ICASE, dfa); + (syntax & RE_ICASE) != 0, dfa); if (BE (err != REG_NOERROR, 0)) { re_compile_internal_free_return: @@ -1059,7 +1059,9 @@ optimize_utf8 (re_dfa_t *dfa) case BUF_LAST: break; default: - /* Word anchors etc. cannot be handled. */ + /* Word anchors etc. cannot be handled. It's okay to test + opr.ctx_type since constraints (for all DFA nodes) are + created by ORing one or more opr.ctx_type values. */ return; } break; @@ -1346,6 +1348,8 @@ calc_first (void *extra, bin_tree_t *node) node->node_idx = re_dfa_add_node (dfa, node->token); if (BE (node->node_idx == REG_MISSING, 0)) return REG_ESPACE; + if (node->token.type == ANCHOR) + dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type; } return REG_NOERROR; } @@ -1475,21 +1479,18 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node, destination. */ org_dest = dfa->edests[org_node].elems[0]; re_node_set_empty (dfa->edests + clone_node); - if (dfa->nodes[org_node].type == ANCHOR) + clone_dest = search_duplicated_node (dfa, org_dest, constraint); + /* If the node is root_node itself, it means the epsilon closure + has a loop. Then tie it to the destination of the root_node. */ + if (org_node == root_node && clone_node != org_node) { - /* In case of the node has another constraint, append it. */ - if (org_node == root_node && clone_node != org_node) - { - /* ...but if the node is root_node itself, it means the - epsilon closure have a loop, then tie it to the - destination of the root_node. */ - ok = re_node_set_insert (dfa->edests + clone_node, org_dest); - if (BE (! ok, 0)) - return REG_ESPACE; - break; - } - constraint |= dfa->nodes[org_node].opr.ctx_type; + ok = re_node_set_insert (dfa->edests + clone_node, org_dest); + if (BE (! ok, 0)) + return REG_ESPACE; + break; } + /* In case the node has another constraint, append it. */ + constraint |= dfa->nodes[org_node].constraint; clone_dest = duplicate_node (dfa, org_dest, constraint); if (BE (clone_dest == REG_MISSING, 0)) return REG_ESPACE; @@ -1507,7 +1508,7 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node, clone_dest = search_duplicated_node (dfa, org_dest, constraint); if (clone_dest == REG_MISSING) { - /* There are no such a duplicated node, create a new one. */ + /* There is no such duplicated node, create a new one. */ reg_errcode_t err; clone_dest = duplicate_node (dfa, org_dest, constraint); if (BE (clone_dest == REG_MISSING, 0)) @@ -1522,7 +1523,7 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node, } else { - /* There are a duplicated node which satisfy the constraint, + /* There is a duplicated node which satisfy the constraint, use it to avoid infinite loop. */ ok = re_node_set_insert (dfa->edests + clone_node, clone_dest); if (BE (! ok, 0)) @@ -1571,8 +1572,7 @@ duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint) if (BE (dup_idx != REG_MISSING, 1)) { dfa->nodes[dup_idx].constraint = constraint; - if (dfa->nodes[org_idx].type == ANCHOR) - dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].opr.ctx_type; + dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint; dfa->nodes[dup_idx].duplicated = 1; /* Store the index of the original node. */ @@ -1654,7 +1654,6 @@ static reg_errcode_t calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root) { reg_errcode_t err; - unsigned int constraint; Idx i; bool incomplete; bool ok; @@ -1668,15 +1667,14 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root) We reference this value to avoid infinite loop. */ dfa->eclosures[node].nelem = REG_MISSING; - constraint = ((dfa->nodes[node].type == ANCHOR) - ? dfa->nodes[node].opr.ctx_type : 0); - /* If the current node has constraints, duplicate all nodes. - Since they must inherit the constraints. */ - if (constraint + /* If the current node has constraints, duplicate all nodes + since they must inherit the constraints. */ + if (dfa->nodes[node].constraint && dfa->edests[node].nelem && !dfa->nodes[dfa->edests[node].elems[0]].duplicated) { - err = duplicate_node_closure (dfa, node, node, node, constraint); + err = duplicate_node_closure (dfa, node, node, node, + dfa->nodes[node].constraint); if (BE (err != REG_NOERROR, 0)) return err; } diff --git a/lib/regex_internal.c b/lib/regex_internal.c index f1a6edd..598fc74 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1691,11 +1691,9 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, for (i = 0 ; i < nodes->nelem ; i++) { - unsigned int constraint = 0; re_token_t *node = dfa->nodes + nodes->elems[i]; re_token_type_t type = node->type; - if (node->constraint) - constraint = node->constraint; + unsigned int constraint = node->constraint; if (type == CHARACTER && !constraint) continue; @@ -1708,8 +1706,6 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes, newstate->halt = 1; else if (type == OP_BACK_REF) newstate->has_backref = 1; - else if (type == ANCHOR) - constraint = node->opr.ctx_type; if (constraint) { diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 5f75169..131e025 100644 --- a/lib/regex_internal.h +++ b/lib/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, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -163,9 +163,9 @@ typedef unsigned long int bitset_word_t; instead, deduce it directly from BITSET_WORD_MAX. Avoid greater-than-32-bit integers and unconditional shifts by more than 31 bits, as they're not portable. */ -#if BITSET_WORD_MAX == 0xffffffff +#if BITSET_WORD_MAX == 0xffffffffUL # define BITSET_WORD_BITS 32 -#elif BITSET_WORD_MAX >> 31 >> 5 == 1 +#elif BITSET_WORD_MAX >> 31 >> 4 == 1 # define BITSET_WORD_BITS 36 #elif BITSET_WORD_MAX >> 31 >> 16 == 1 # define BITSET_WORD_BITS 48 @@ -423,7 +423,7 @@ struct re_dfa_t; typedef struct re_dfa_t re_dfa_t; #ifndef _LIBC -# ifdef __i386__ +# if defined __i386__ && !defined __EMX__ # define internal_function __attribute ((regparm (3), stdcall)) # else # define internal_function diff --git a/lib/regexec.c b/lib/regexec.c index 6555498..a0942cc 100644 --- a/lib/regexec.c +++ b/lib/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, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -703,7 +703,8 @@ re_search_internal (const regex_t *preg, fl_longest_match = (nmatch != 0 || dfa->nbackref); err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1, - preg->translate, preg->syntax & RE_ICASE, dfa); + preg->translate, (preg->syntax & RE_ICASE) != 0, + dfa); if (BE (err != REG_NOERROR, 0)) goto free_return; mctx.input.stop = stop; @@ -3469,7 +3470,7 @@ out_free: CONTEXT_NEWLINE); if (BE (dest_states_nl[i] == NULL && err != REG_NOERROR, 0)) goto out_free; - } + } else { dest_states_word[i] = dest_states[i]; diff --git a/lib/rpmatch.c b/lib/rpmatch.c index 826bc4c..217e171 100644 --- a/lib/rpmatch.c +++ b/lib/rpmatch.c @@ -1,7 +1,7 @@ /* Determine whether string value is affirmation or negative response according to current locale's data. - Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006 Free Software + Copyright (C) 1996, 1998, 2000, 2002, 2003, 2006-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -19,37 +19,103 @@ #include -#include +/* Specification. */ #include +#include +#include + #if ENABLE_NLS # include # include +# include +# if HAVE_LANGINFO_YESEXPR +# include +# endif # include # include "gettext.h" # define _(msgid) gettext (msgid) +# define N_(msgid) gettext_noop (msgid) + +# if HAVE_LANGINFO_YESEXPR +/* Return the localized regular expression pattern corresponding to + ENGLISH_PATTERN. NL_INDEX can be used with nl_langinfo. + The resulting string may only be used until the next nl_langinfo call. */ +static const char * +localized_pattern (const char *english_pattern, nl_item nl_index, + bool posixly_correct) +{ + const char *translated_pattern; + + /* We prefer to get the patterns from a PO file. It would be possible to + always use nl_langinfo (YESEXPR) instead of _("^[yY]"), and + nl_langinfo (NOEXPR) instead of _("^[nN]"), if we could assume that the + system's locale support is good. But this is not the case e.g. on Cygwin. + The localizations of gnulib.pot are of better quality in general. + Also, if we use locale info from non-free systems that don't have a + 'localedef' command, we deprive the users of the freedom to localize + this pattern for their preferred language. + But some programs, such as 'cp', 'mv', 'rm', 'find', 'xargs', are + specified by POSIX to use nl_langinfo (YESEXPR). We implement this + behaviour if POSIXLY_CORRECT is set, for the sake of these programs. */ + + /* If the user wants strict POSIX compliance, use nl_langinfo. */ + if (posixly_correct) + { + translated_pattern = nl_langinfo (nl_index); + /* Check against a broken system return value. */ + if (translated_pattern != NULL && translated_pattern[0] != '\0') + return translated_pattern; + } + + /* Look in the gnulib message catalog. */ + translated_pattern = _(english_pattern); + if (translated_pattern == english_pattern) + { + /* The gnulib message catalog provides no translation. + Try the system's message catalog. */ + translated_pattern = nl_langinfo (nl_index); + /* Check against a broken system return value. */ + if (translated_pattern != NULL && translated_pattern[0] != '\0') + return translated_pattern; + /* Fall back to English. */ + translated_pattern = english_pattern; + } + return translated_pattern; +} +# else +# define localized_pattern(english_pattern,nl_index,posixly_correct) \ + _(english_pattern) +# endif static int -try (const char *response, const char *pattern, const int match, - const int nomatch, const char **lastp, regex_t *re) +try (const char *response, const char *pattern, char **lastp, regex_t *re) { - if (pattern != *lastp) + if (*lastp == NULL || strcmp (pattern, *lastp) != 0) { + char *safe_pattern; + /* The pattern has changed. */ - if (*lastp) + if (*lastp != NULL) { /* Free the old compiled pattern. */ regfree (re); + free (*lastp); *lastp = NULL; } + /* Put the PATTERN into safe memory before calling regcomp. + (regcomp may call nl_langinfo, overwriting PATTERN's storage. */ + safe_pattern = strdup (pattern); + if (safe_pattern == NULL) + return -1; /* Compile the pattern and cache it for future runs. */ - if (regcomp (re, pattern, REG_EXTENDED) != 0) + if (regcomp (re, safe_pattern, REG_EXTENDED) != 0) return -1; - *lastp = pattern; + *lastp = safe_pattern; } /* See if the regular expression matches RESPONSE. */ - return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch; + return regexec (re, response, 0, NULL, 0) == 0; } #endif @@ -62,14 +128,43 @@ rpmatch (const char *response) first if necessary. */ /* We cache the response patterns and compiled regexps here. */ - static const char *yesexpr, *noexpr; - static regex_t yesre, nore; + static char *last_yesexpr, *last_noexpr; + static regex_t cached_yesre, cached_nore; + +# if HAVE_LANGINFO_YESEXPR + bool posixly_correct = (getenv ("POSIXLY_CORRECT") != NULL); +# endif + + const char *yesexpr, *noexpr; int result; - return ((result = try (response, _("^[yY]"), 1, 0, - &yesexpr, &yesre)) - ? result - : try (response, _("^[nN]"), 0, -1, &noexpr, &nore)); + /* 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=' */ + yesexpr = localized_pattern (N_("^[yY]"), YESEXPR, posixly_correct); + result = try (response, yesexpr, &last_yesexpr, &cached_yesre); + if (result < 0) + return -1; + if (result) + return 1; + + /* 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=' */ + noexpr = localized_pattern (N_("^[nN]"), NOEXPR, posixly_correct); + result = try (response, noexpr, &last_noexpr, &cached_nore); + if (result < 0) + return -1; + if (result) + return 0; + + return -1; #else /* Test against "^[yY]" and "^[nN]", hardcoded to avoid requiring regex */ return (*response == 'y' || *response == 'Y' ? 1 diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h index af5bc83..6e1d4b5 100644 --- a/lib/stdarg.in.h +++ b/lib/stdarg.in.h @@ -19,6 +19,10 @@ #ifndef _GL_STDARG_H +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STDARG_H@ diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h index 42599f9..d95f723 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify @@ -60,7 +60,7 @@ /* BeOS already #defines false 0, true 1. We use the same definitions below, but temporarily we have to #undef them. */ -#ifdef __BEOS__ +#if defined __BEOS__ && !defined __HAIKU__ # include /* defines bool but not _Bool */ # undef false # undef true @@ -75,7 +75,7 @@ (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the enum; this ensures that '_Bool' promotes to 'int'. */ -#if defined __cplusplus || defined __BEOS__ +#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__) /* A compiler known to have 'bool'. */ /* If the compiler already has both 'bool' and '_Bool', we can assume they are the same types. */ diff --git a/lib/stdint.in.h b/lib/stdint.in.h index cbaf697..55fe176 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001-2002, 2004-2007 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2008 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -51,6 +51,9 @@ in would reinclude us, skipping our contents because _GL_STDINT_H is defined. The include_next requires a split double-inclusion guard. */ +# if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +# endif # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #endif diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h new file mode 100644 index 0000000..c803e88 --- /dev/null +++ b/lib/stdio-impl.h @@ -0,0 +1,94 @@ +/* Implementation details of FILE streams. + Copyright (C) 2007-2008 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Many stdio implementations have the same logic and therefore can share + the same implementation of stdio extension API, except that some fields + have different naming conventions, or their access requires some casts. */ + + +/* BSD stdio derived implementations. */ + +#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ + +# if defined __DragonFly__ /* DragonFly */ + /* See . */ +# define fp_ ((struct { struct __FILE_public pub; \ + struct { unsigned char *_base; int _size; } _bf; \ + void *cookie; \ + void *_close; \ + void *_read; \ + void *_seek; \ + void *_write; \ + struct { unsigned char *_base; int _size; } _ub; \ + int _ur; \ + unsigned char _ubuf[3]; \ + unsigned char _nbuf[1]; \ + struct { unsigned char *_base; int _size; } _lb; \ + int _blksize; \ + fpos_t _offset; \ + /* More fields, not relevant here. */ \ + } *) fp) + /* See . */ +# define _p pub._p +# define _flags pub._flags +# define _r pub._r +# define _w pub._w +# else +# define fp_ fp +# endif + +# if defined __NetBSD__ || defined __OpenBSD__ /* NetBSD, OpenBSD */ + /* See + and */ + struct __sfileext + { + struct __sbuf _ub; /* ungetc buffer */ + /* More fields, not relevant here. */ + }; +# define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub +# else /* FreeBSD, DragonFly, MacOS X, Cygwin */ +# define fp_ub fp_->_ub +# endif + +# define HASUB(fp) (fp_ub._base != NULL) + +#endif + + +/* SystemV derived implementations. */ + +#if defined _IOERR + +# if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ +# define fp_ ((struct { unsigned char *_ptr; \ + unsigned char *_base; \ + unsigned char *_end; \ + long _cnt; \ + int _file; \ + unsigned int _flag; \ + } *) fp) +# else +# define fp_ fp +# endif + +# if defined _SCO_DS /* OpenServer */ +# define _cnt __cnt +# define _ptr __ptr +# define _base __base +# define _flag __flag +# endif + +#endif diff --git a/lib/stdio-write.c b/lib/stdio-write.c new file mode 100644 index 0000000..f1d0fcb --- /dev/null +++ b/lib/stdio-write.c @@ -0,0 +1,148 @@ +/* POSIX compatible FILE stream write function. + Copyright (C) 2008 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +/* Replace these functions only if module 'sigpipe' is requested. */ +#if GNULIB_SIGPIPE + +/* On native Windows platforms, SIGPIPE does not exist. When write() is + called on a pipe with no readers, WriteFile() fails with error + GetLastError() = ERROR_NO_DATA, and write() in consequence fails with + error EINVAL. This write() function is at the basis of the function + which flushes the buffer of a FILE stream. */ + +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + +# include +# include +# include + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +# define CALL_WITH_SIGPIPE_EMULATION(RETTYPE, EXPRESSION, FAILED) \ + if (ferror (stream)) \ + return (EXPRESSION); \ + else \ + { \ + RETTYPE ret; \ + SetLastError (0); \ + ret = (EXPRESSION); \ + if (FAILED && GetLastError () == ERROR_NO_DATA && ferror (stream)) \ + { \ + int fd = fileno (stream); \ + if (fd >= 0 \ + && GetFileType ((HANDLE) _get_osfhandle (fd)) == FILE_TYPE_PIPE)\ + { \ + /* Try to raise signal SIGPIPE. */ \ + raise (SIGPIPE); \ + /* If it is currently blocked or ignored, change errno from \ + EINVAL to EPIPE. */ \ + errno = EPIPE; \ + } \ + } \ + return ret; \ + } + +# if !REPLACE_PRINTF_POSIX /* avoid collision with printf.c */ +int +printf (const char *format, ...) +{ + int retval; + va_list args; + + va_start (args, format); + retval = vfprintf (stdout, format, args); + va_end (args); + + return retval; +} +# endif + +# if !REPLACE_FPRINTF_POSIX /* avoid collision with fprintf.c */ +int +fprintf (FILE *stream, const char *format, ...) +{ + int retval; + va_list args; + + va_start (args, format); + retval = vfprintf (stream, format, args); + va_end (args); + + return retval; +} +# endif + +# if !REPLACE_VFPRINTF_POSIX /* avoid collision with vprintf.c */ +int +vprintf (const char *format, va_list args) +{ + return vfprintf (stdout, format, args); +} +# endif + +# if !REPLACE_VPRINTF_POSIX /* avoid collision with vfprintf.c */ +int +vfprintf (FILE *stream, const char *format, va_list args) +#undef vfprintf +{ + CALL_WITH_SIGPIPE_EMULATION (int, vfprintf (stream, format, args), ret == EOF) +} +# endif + +int +putchar (int c) +{ + return fputc (c, stdout); +} + +int +fputc (int c, FILE *stream) +#undef fputc +{ + CALL_WITH_SIGPIPE_EMULATION (int, fputc (c, stream), ret == EOF) +} + +int +fputs (const char *string, FILE *stream) +#undef fputs +{ + CALL_WITH_SIGPIPE_EMULATION (int, fputs (string, stream), ret == EOF) +} + +int +puts (const char *string) +#undef puts +{ + FILE *stream = stdout; + CALL_WITH_SIGPIPE_EMULATION (int, puts (string), ret == EOF) +} + +size_t +fwrite (const void *ptr, size_t s, size_t n, FILE *stream) +#undef fwrite +{ + CALL_WITH_SIGPIPE_EMULATION (size_t, fwrite (ptr, s, n, stream), ret < n) +} + +# endif +#endif diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 3da40fe..c237604 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + #if defined __need_FILE || defined __need___FILE /* Special invocation convention inside glibc header files. */ @@ -73,6 +77,10 @@ extern "C" { extern int fprintf (FILE *fp, const char *format, ...) __attribute__ ((__format__ (__printf__, 2, 3))); # endif +#elif @GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# define fprintf rpl_fprintf +extern int fprintf (FILE *fp, const char *format, ...) + __attribute__ ((__format__ (__printf__, 2, 3))); #elif defined GNULIB_POSIXCHECK # undef fprintf # define fprintf \ @@ -88,6 +96,10 @@ extern int fprintf (FILE *fp, const char *format, ...) extern int vfprintf (FILE *fp, const char *format, va_list args) __attribute__ ((__format__ (__printf__, 2, 0))); # endif +#elif @GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# define vfprintf rpl_vfprintf +extern int vfprintf (FILE *fp, const char *format, va_list args) + __attribute__ ((__format__ (__printf__, 2, 0))); #elif defined GNULIB_POSIXCHECK # undef vfprintf # define vfprintf(s,f,a) \ @@ -104,6 +116,11 @@ extern int vfprintf (FILE *fp, const char *format, va_list args) extern int printf (const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2))); # endif +#elif @GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +/* Don't break __attribute__((format(printf,M,N))). */ +# define printf __printf__ +extern int printf (const char *format, ...) + __attribute__ ((__format__ (__printf__, 1, 2))); #elif defined GNULIB_POSIXCHECK # undef printf # define printf \ @@ -126,6 +143,10 @@ extern int printf (const char *format, ...) extern int vprintf (const char *format, va_list args) __attribute__ ((__format__ (__printf__, 1, 0))); # endif +#elif @GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# define vprintf rpl_vprintf +extern int vprintf (const char *format, va_list args) + __attribute__ ((__format__ (__printf__, 1, 0))); #elif defined GNULIB_POSIXCHECK # undef vprintf # define vprintf(f,a) \ @@ -214,8 +235,29 @@ extern int vsprintf (char *str, const char *format, va_list args) # endif #endif +#if @GNULIB_OBSTACK_PRINTF@ +# if @REPLACE_OBSTACK_PRINTF@ +# define obstack_printf rpl_osbtack_printf +# define obstack_vprintf rpl_obstack_vprintf +# endif +# if @REPLACE_OBSTACK_PRINTF@ || !@HAVE_DECL_OBSTACK_PRINTF@ + struct obstack; + /* Grow an obstack with formatted output. Return the number of + bytes added to OBS. No trailing nul byte is added, and the + object should be closed with obstack_finish before use. Upon + memory allocation error, call obstack_alloc_failed_handler. Upon + other error, return -1. */ + extern int obstack_printf (struct obstack *obs, const char *format, ...) + __attribute__ ((__format__ (__printf__, 2, 3))); + extern int obstack_vprintf (struct obstack *obs, const char *format, + va_list args) + __attribute__ ((__format__ (__printf__, 2, 0))); +# endif +#endif + #if @GNULIB_FOPEN@ # if @REPLACE_FOPEN@ +# undef fopen # define fopen rpl_fopen extern FILE * fopen (const char *filename, const char *mode); # endif @@ -229,6 +271,7 @@ extern FILE * fopen (const char *filename, const char *mode); #if @GNULIB_FREOPEN@ # if @REPLACE_FREOPEN@ +# undef freopen # define freopen rpl_freopen extern FILE * freopen (const char *filename, const char *mode, FILE *stream); # endif @@ -334,6 +377,57 @@ extern long rpl_ftell (FILE *fp); fflush (f)) #endif +#if @GNULIB_FCLOSE@ +# if @REPLACE_FCLOSE@ +# define fclose rpl_fclose + /* Close STREAM and its underlying file descriptor. */ +extern int fclose (FILE *stream); +# endif +#elif defined GNULIB_POSIXCHECK +# undef fclose +# define fclose(f) \ + (GL_LINK_WARNING ("fclose is not always POSIX compliant - " \ + "use gnulib module fclose for portable " \ + "POSIX compliance"), \ + fclose (f)) +#endif + +#if @GNULIB_FPUTC@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# undef fputc +# define fputc rpl_fputc +extern int fputc (int c, FILE *stream); +#endif + +#if @GNULIB_PUTC@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# undef putc +# define putc rpl_fputc +extern int putc (int c, FILE *stream); +#endif + +#if @GNULIB_PUTCHAR@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# undef putchar +# define putchar rpl_putchar +extern int putchar (int c); +#endif + +#if @GNULIB_FPUTS@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# undef fputs +# define fputs rpl_fputs +extern int fputs (const char *string, FILE *stream); +#endif + +#if @GNULIB_PUTS@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# undef puts +# define puts rpl_puts +extern int puts (const char *string); +#endif + +#if @GNULIB_FWRITE@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@ +# undef fwrite +# define fwrite rpl_fwrite +extern size_t fwrite (const void *ptr, size_t s, size_t n, FILE *stream); +#endif + #if @GNULIB_GETDELIM@ # if !@HAVE_DECL_GETDELIM@ /* Read input, up to (and including) the next occurrence of DELIMITER, from @@ -375,6 +469,22 @@ extern ssize_t getline (char **lineptr, size_t *linesize, FILE *stream); getline (l, s, f)) #endif +#if @GNULIB_PERROR@ +# if @REPLACE_PERROR@ +# define perror rpl_perror +/* Print a message to standard error, describing the value of ERRNO, + (if STRING is not NULL and not empty) prefixed with STRING and ": ", + and terminated with a newline. */ +extern void perror (const char *string); +# endif +#elif defined GNULIB_POSIXCHECK +# undef perror +# define perror(s) \ + (GL_LINK_WARNING ("perror is not always POSIX compliant - " \ + "use gnulib module perror for portability"), \ + perror (s)) +#endif + #ifdef __cplusplus } #endif diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 0181dd2..f6ebe25 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -15,6 +15,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + #if defined __need_malloc_and_calloc /* Special invocation convention inside glibc header files. */ @@ -32,6 +36,28 @@ #define _GL_STDLIB_H +/* Solaris declares getloadavg() in . */ +#if @GNULIB_GETLOADAVG@ && @HAVE_SYS_LOADAVG_H@ +# include +#endif + +#if @GNULIB_RANDOM_R@ || !@HAVE_STRUCT_RANDOM_DATA@ +# include +#endif + +#if !@HAVE_STRUCT_RANDOM_DATA@ +struct random_data +{ + int32_t *fptr; /* Front pointer. */ + int32_t *rptr; /* Rear pointer. */ + int32_t *state; /* Array of state values. */ + int rand_type; /* Type of random number generator. */ + int rand_deg; /* Degree of random number generator. */ + int rand_sep; /* Distance between front and rear. */ + int32_t *end_ptr; /* Pointer behind state table. */ +}; +#endif + /* The definition of GL_LINK_WARNING is copied here. */ @@ -99,6 +125,38 @@ extern void * calloc (size_t nmemb, size_t size); #endif +#if @GNULIB_ATOLL@ +# if !@HAVE_ATOLL@ +/* Parse a signed decimal integer. + Returns the value of the integer. Errors are not detected. */ +extern long long atoll (const char *string); +# endif +#elif defined GNULIB_POSIXCHECK +# undef atoll +# define atoll(s) \ + (GL_LINK_WARNING ("atoll is unportable - " \ + "use gnulib module atoll for portability"), \ + atoll (s)) +#endif + + +#if @GNULIB_GETLOADAVG@ +# if !@HAVE_DECL_GETLOADAVG@ +/* Store max(NELEM,3) load average numbers in LOADAVG[]. + The three numbers are the load average of the last 1 minute, the last 5 + minutes, and the last 15 minutes, respectively. + LOADAVG is an array of NELEM numbers. */ +extern int getloadavg (double loadavg[], int nelem); +# endif +#elif defined GNULIB_POSIXCHECK +# undef getloadavg +# define getloadavg(l,n) \ + (GL_LINK_WARNING ("getloadavg is not portable - " \ + "use gnulib module getloadavg for portability"), \ + getloadavg (l, n)) +#endif + + #if @GNULIB_GETSUBOPT@ /* Assuming *OPTIONP is a comma separated list of elements of the form "token" or "token=value", getsubopt parses the first of these elements. @@ -176,6 +234,58 @@ extern int putenv (char *string); #endif +#if @GNULIB_RANDOM_R@ +# if !@HAVE_RANDOM_R@ + +# ifndef RAND_MAX +# define RAND_MAX 2147483647 +# endif + +int srandom_r (unsigned int seed, struct random_data *rand_state); +int initstate_r (unsigned int seed, char *buf, size_t buf_size, + struct random_data *rand_state); +int setstate_r (char *arg_state, struct random_data *rand_state); +int random_r (struct random_data *buf, int32_t *result); +# endif +#elif defined GNULIB_POSIXCHECK +# undef random_r +# define random_r(b,r) \ + (GL_LINK_WARNING ("random_r is unportable - " \ + "use gnulib module random_r for portability"), \ + random_r (b,r)) +# undef initstate_r +# define initstate_r(s,b,sz,r) \ + (GL_LINK_WARNING ("initstate_r is unportable - " \ + "use gnulib module random_r for portability"), \ + initstate_r (s,b,sz,r)) +# undef srandom_r +# define srandom_r(s,r) \ + (GL_LINK_WARNING ("srandom_r is unportable - " \ + "use gnulib module random_r for portability"), \ + srandom_r (s,r)) +# undef setstate_r +# define setstate_r(a,r) \ + (GL_LINK_WARNING ("setstate_r is unportable - " \ + "use gnulib module random_r for portability"), \ + setstate_r (a,r)) +#endif + + +#if @GNULIB_RPMATCH@ +# if !@HAVE_RPMATCH@ +/* Test a user response to a question. + Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear. */ +extern int rpmatch (const char *response); +# endif +#elif defined GNULIB_POSIXCHECK +# undef rpmatch +# define rpmatch(r) \ + (GL_LINK_WARNING ("rpmatch is unportable - " \ + "use gnulib module rpmatch for portability"), \ + rpmatch (r)) +#endif + + #if @GNULIB_SETENV@ # if !@HAVE_SETENV@ /* Set NAME to VALUE in the environment. @@ -216,6 +326,48 @@ extern double strtod (const char *str, char **endp); #endif +#if @GNULIB_STRTOLL@ +# if !@HAVE_STRTOLL@ +/* Parse a signed integer whose textual representation starts at STRING. + The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, + it may be decimal or octal (with prefix "0") or hexadecimal (with prefix + "0x"). + If ENDPTR is not NULL, the address of the first byte after the integer is + stored in *ENDPTR. + Upon overflow, the return value is LLONG_MAX or LLONG_MIN, and errno is set + to ERANGE. */ +extern long long strtoll (const char *string, char **endptr, int base); +# endif +#elif defined GNULIB_POSIXCHECK +# undef strtoll +# define strtoll(s,e,b) \ + (GL_LINK_WARNING ("strtoll is unportable - " \ + "use gnulib module strtoll for portability"), \ + strtoll (s, e, b)) +#endif + + +#if @GNULIB_STRTOULL@ +# if !@HAVE_STRTOULL@ +/* Parse an unsigned integer whose textual representation starts at STRING. + The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0, + it may be decimal or octal (with prefix "0") or hexadecimal (with prefix + "0x"). + If ENDPTR is not NULL, the address of the first byte after the integer is + stored in *ENDPTR. + Upon overflow, the return value is ULLONG_MAX, and errno is set to + ERANGE. */ +extern unsigned long long strtoull (const char *string, char **endptr, int base); +# endif +#elif defined GNULIB_POSIXCHECK +# undef strtoull +# define strtoull(s,e,b) \ + (GL_LINK_WARNING ("strtoull is unportable - " \ + "use gnulib module strtoull for portability"), \ + strtoull (s, e, b)) +#endif + + #ifdef __cplusplus } #endif diff --git a/lib/strchrnul.c b/lib/strchrnul.c index da4049d..5ed237c 100644 --- a/lib/strchrnul.c +++ b/lib/strchrnul.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2003, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc. This 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,120 @@ char * strchrnul (const char *s, int c_in) { - char c = c_in; - while (*s && (*s != c)) - s++; + /* On 32-bit hardware, choosing longword to be a 32-bit unsigned + long instead of a 64-bit uintmax_t tends to give better + performance. On 64-bit hardware, unsigned long is generally 64 + bits already. Change this typedef to experiment with + performance. */ + typedef unsigned long int longword; - return (char *) s; + const unsigned char *char_ptr; + const longword *longword_ptr; + longword repeated_one; + longword repeated_c; + unsigned char c; + + c = (unsigned char) c_in; + if (!c) + return rawmemchr (s, 0); + + /* Handle the first few bytes by reading one byte at a time. + Do this until CHAR_PTR is aligned on a longword boundary. */ + for (char_ptr = (const unsigned char *) s; + (size_t) char_ptr % sizeof (longword) != 0; + ++char_ptr) + if (!*char_ptr || *char_ptr == c) + return (char *) char_ptr; + + longword_ptr = (const longword *) char_ptr; + + /* All these elucidatory comments refer to 4-byte longwords, + but the theory applies equally well to any size longwords. */ + + /* Compute auxiliary longword values: + repeated_one is a value which has a 1 in every byte. + repeated_c has c in every byte. */ + repeated_one = 0x01010101; + repeated_c = c | (c << 8); + repeated_c |= repeated_c << 16; + if (0xffffffffU < (longword) -1) + { + repeated_one |= repeated_one << 31 << 1; + repeated_c |= repeated_c << 31 << 1; + if (8 < sizeof (longword)) + { + size_t i; + + for (i = 64; i < sizeof (longword) * 8; i *= 2) + { + repeated_one |= repeated_one << i; + repeated_c |= repeated_c << i; + } + } + } + + /* Instead of the traditional loop which tests each byte, we will + test a longword at a time. The tricky part is testing if *any of + the four* bytes in the longword in question are equal to NUL or + c. We first use an xor with repeated_c. This reduces the task + to testing whether *any of the four* bytes in longword1 or + longword2 is zero. + + Let's consider longword1. We compute tmp = + ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7). + That is, we perform the following operations: + 1. Subtract repeated_one. + 2. & ~longword1. + 3. & a mask consisting of 0x80 in every byte. + Consider what happens in each byte: + - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff, + and step 3 transforms it into 0x80. A carry can also be propagated + to more significant bytes. + - If a byte of longword1 is nonzero, let its lowest 1 bit be at + position k (0 <= k <= 7); so the lowest k bits are 0. After step 1, + the byte ends in a single bit of value 0 and k bits of value 1. + After step 2, the result is just k bits of value 1: 2^k - 1. After + step 3, the result is 0. And no carry is produced. + So, if longword1 has only non-zero bytes, tmp is zero. + Whereas if longword1 has a zero byte, call j the position of the least + significant zero byte. Then the result has a zero at positions 0, ..., + j-1 and a 0x80 at position j. We cannot predict the result at the more + significant bytes (positions j+1..3), but it does not matter since we + already have a non-zero bit at position 8*j+7. + + The test whether any byte in longword1 or longword2 is zero is equivalent + to testing whether tmp1 is nonzero or tmp2 is nonzero. We can combine + this into a single test, whether (tmp1 | tmp2) is nonzero. + + This test can read more than one byte beyond the end of a string, + depending on where the terminating NUL is encountered. However, + this is considered safe since the initialization phase ensured + that the read will be aligned, therefore, the read will not cross + page boundaries and will not cause a fault. */ + + while (1) + { + longword longword1 = *longword_ptr ^ repeated_c; + longword longword2 = *longword_ptr; + + if (((((longword1 - repeated_one) & ~longword1) + | ((longword2 - repeated_one) & ~longword2)) + & (repeated_one << 7)) != 0) + break; + longword_ptr++; + } + + char_ptr = (const unsigned char *) longword_ptr; + + /* At this point, we know that one of the sizeof (longword) bytes + starting at char_ptr is == 0 or == c. On little-endian machines, + we could determine the first such byte without any further memory + accesses, just by looking at the tmp result from the last loop + iteration. But this does not work on big-endian machines. + Choose code that works in both cases. */ + + char_ptr = (unsigned char *) longword_ptr; + while (*char_ptr && (*char_ptr != c)) + char_ptr++; + return (char *) char_ptr; } diff --git a/lib/strchrnul.valgrind b/lib/strchrnul.valgrind new file mode 100644 index 0000000..b14fa13 --- /dev/null +++ b/lib/strchrnul.valgrind @@ -0,0 +1,12 @@ +# Suppress a valgrind message about use of uninitialized memory in strchrnul(). +# This use is OK because it provides only a speedup. +{ + strchrnul-value4 + Memcheck:Value4 + fun:strchrnul +} +{ + strchrnul-value8 + Memcheck:Value8 + fun:strchrnul +} diff --git a/lib/strerror.c b/lib/strerror.c index 9fe437d..787575f 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,8 +21,15 @@ #if REPLACE_STRERROR +# include # include +# if GNULIB_defined_ESOCK /* native Windows platforms */ +# if HAVE_WINSOCK2_H +# include +# endif +# endif + # include "intprops.h" # undef strerror @@ -33,17 +40,234 @@ char * rpl_strerror (int n) { - char *result = strerror (n); - - if (result == NULL || result[0] == '\0') + /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */ + switch (n) { - static char const fmt[] = "Unknown error (%d)"; - static char mesg[sizeof fmt + INT_STRLEN_BOUND (n)]; - sprintf (mesg, fmt, n); - return mesg; +# if GNULIB_defined_ETXTBSY + case ETXTBSY: + return "Text file busy"; +# endif + +# if GNULIB_defined_ESOCK /* native Windows platforms */ + /* EWOULDBLOCK is the same as EAGAIN. */ + case EINPROGRESS: + return "Operation now in progress"; + case EALREADY: + return "Operation already in progress"; + case ENOTSOCK: + return "Socket operation on non-socket"; + case EDESTADDRREQ: + return "Destination address required"; + case EMSGSIZE: + return "Message too long"; + case EPROTOTYPE: + return "Protocol wrong type for socket"; + case ENOPROTOOPT: + return "Protocol not available"; + case EPROTONOSUPPORT: + return "Protocol not supported"; + case ESOCKTNOSUPPORT: + return "Socket type not supported"; + case EOPNOTSUPP: + return "Operation not supported"; + case EPFNOSUPPORT: + return "Protocol family not supported"; + case EAFNOSUPPORT: + return "Address family not supported by protocol"; + case EADDRINUSE: + return "Address already in use"; + case EADDRNOTAVAIL: + return "Cannot assign requested address"; + case ENETDOWN: + return "Network is down"; + case ENETUNREACH: + return "Network is unreachable"; + case ENETRESET: + return "Network dropped connection on reset"; + case ECONNABORTED: + return "Software caused connection abort"; + case ECONNRESET: + return "Connection reset by peer"; + case ENOBUFS: + return "No buffer space available"; + case EISCONN: + return "Transport endpoint is already connected"; + case ENOTCONN: + return "Transport endpoint is not connected"; + case ESHUTDOWN: + return "Cannot send after transport endpoint shutdown"; + case ETOOMANYREFS: + return "Too many references: cannot splice"; + case ETIMEDOUT: + return "Connection timed out"; + case ECONNREFUSED: + return "Connection refused"; + case ELOOP: + return "Too many levels of symbolic links"; + case EHOSTDOWN: + return "Host is down"; + case EHOSTUNREACH: + return "No route to host"; + case EPROCLIM: + return "Too many processes"; + case EUSERS: + return "Too many users"; + case EDQUOT: + return "Disk quota exceeded"; + case ESTALE: + return "Stale NFS file handle"; + case EREMOTE: + return "Object is remote"; +# if HAVE_WINSOCK2_H + /* WSA_INVALID_HANDLE maps to EBADF */ + /* WSA_NOT_ENOUGH_MEMORY maps to ENOMEM */ + /* WSA_INVALID_PARAMETER maps to EINVAL */ + case WSA_OPERATION_ABORTED: + return "Overlapped operation aborted"; + case WSA_IO_INCOMPLETE: + return "Overlapped I/O event object not in signaled state"; + case WSA_IO_PENDING: + return "Overlapped operations will complete later"; + /* WSAEINTR maps to EINTR */ + /* WSAEBADF maps to EBADF */ + /* WSAEACCES maps to EACCES */ + /* WSAEFAULT maps to EFAULT */ + /* WSAEINVAL maps to EINVAL */ + /* WSAEMFILE maps to EMFILE */ + /* WSAEWOULDBLOCK maps to EWOULDBLOCK */ + /* WSAEINPROGRESS is EINPROGRESS */ + /* WSAEALREADY is EALREADY */ + /* WSAENOTSOCK is ENOTSOCK */ + /* WSAEDESTADDRREQ is EDESTADDRREQ */ + /* WSAEMSGSIZE is EMSGSIZE */ + /* WSAEPROTOTYPE is EPROTOTYPE */ + /* WSAENOPROTOOPT is ENOPROTOOPT */ + /* WSAEPROTONOSUPPORT is EPROTONOSUPPORT */ + /* WSAESOCKTNOSUPPORT is ESOCKTNOSUPPORT */ + /* WSAEOPNOTSUPP is EOPNOTSUPP */ + /* WSAEPFNOSUPPORT is EPFNOSUPPORT */ + /* WSAEAFNOSUPPORT is EAFNOSUPPORT */ + /* WSAEADDRINUSE is EADDRINUSE */ + /* WSAEADDRNOTAVAIL is EADDRNOTAVAIL */ + /* WSAENETDOWN is ENETDOWN */ + /* WSAENETUNREACH is ENETUNREACH */ + /* WSAENETRESET is ENETRESET */ + /* WSAECONNABORTED is ECONNABORTED */ + /* WSAECONNRESET is ECONNRESET */ + /* WSAENOBUFS is ENOBUFS */ + /* WSAEISCONN is EISCONN */ + /* WSAENOTCONN is ENOTCONN */ + /* WSAESHUTDOWN is ESHUTDOWN */ + /* WSAETOOMANYREFS is ETOOMANYREFS */ + /* WSAETIMEDOUT is ETIMEDOUT */ + /* WSAECONNREFUSED is ECONNREFUSED */ + /* WSAELOOP is ELOOP */ + /* WSAENAMETOOLONG maps to ENAMETOOLONG */ + /* WSAEHOSTDOWN is EHOSTDOWN */ + /* WSAEHOSTUNREACH is EHOSTUNREACH */ + /* WSAENOTEMPTY maps to ENOTEMPTY */ + /* WSAEPROCLIM is EPROCLIM */ + /* WSAEUSERS is EUSERS */ + /* WSAEDQUOT is EDQUOT */ + /* WSAESTALE is ESTALE */ + /* WSAEREMOTE is EREMOTE */ + case WSASYSNOTREADY: + return "Network subsystem is unavailable"; + case WSAVERNOTSUPPORTED: + return "Winsock.dll version out of range"; + case WSANOTINITIALISED: + return "Successful WSAStartup not yet performed"; + case WSAEDISCON: + return "Graceful shutdown in progress"; + case WSAENOMORE: case WSA_E_NO_MORE: + return "No more results"; + case WSAECANCELLED: case WSA_E_CANCELLED: + return "Call was canceled"; + case WSAEINVALIDPROCTABLE: + return "Procedure call table is invalid"; + case WSAEINVALIDPROVIDER: + return "Service provider is invalid"; + case WSAEPROVIDERFAILEDINIT: + return "Service provider failed to initialize"; + case WSASYSCALLFAILURE: + return "System call failure"; + case WSASERVICE_NOT_FOUND: + return "Service not found"; + case WSATYPE_NOT_FOUND: + return "Class type not found"; + case WSAEREFUSED: + return "Database query was refused"; + case WSAHOST_NOT_FOUND: + return "Host not found"; + case WSATRY_AGAIN: + return "Nonauthoritative host not found"; + case WSANO_RECOVERY: + return "Nonrecoverable error"; + case WSANO_DATA: + return "Valid name, no data record of requested type"; + /* WSA_QOS_* omitted */ +# endif +# endif + +# if GNULIB_defined_ENOMSG + case ENOMSG: + return "No message of desired type"; +# endif + +# if GNULIB_defined_EIDRM + case EIDRM: + return "Identifier removed"; +# endif + +# if GNULIB_defined_ENOLINK + case ENOLINK: + return "Link has been severed"; +# endif + +# if GNULIB_defined_EPROTO + case EPROTO: + return "Protocol error"; +# endif + +# if GNULIB_defined_EMULTIHOP + case EMULTIHOP: + return "Multihop attempted"; +# endif + +# if GNULIB_defined_EBADMSG + case EBADMSG: + return "Bad message"; +# endif + +# if GNULIB_defined_EOVERFLOW + case EOVERFLOW: + return "Value too large for defined data type"; +# endif + +# if GNULIB_defined_ENOTSUP + case ENOTSUP: + return "Not supported"; +# endif + +# if GNULIB_defined_ + case ECANCELED: + return "Operation canceled"; +# endif } - return result; + { + char *result = strerror (n); + + if (result == NULL || result[0] == '\0') + { + static char const fmt[] = "Unknown error (%d)"; + static char mesg[sizeof fmt + INT_STRLEN_BOUND (n)]; + sprintf (mesg, fmt, n); + return mesg; + } + + return result; + } } #endif diff --git a/lib/string.in.h b/lib/string.in.h index 57a89b5..a300dad 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -20,6 +20,10 @@ #ifndef _GL_STRING_H +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRING_H@ @@ -95,6 +99,22 @@ extern void *memrchr (void const *, int, size_t) memrchr (a, b, c)) #endif +/* Find the first occurrence of C in S. More efficient than + memchr(S,C,N), at the expense of undefined behavior if C does not + occur within N bytes. */ +#if @GNULIB_RAWMEMCHR@ +# if ! @HAVE_RAWMEMCHR@ +extern void *rawmemchr (void const *__s, int __c_in) + __attribute__ ((__pure__)); +# endif +#elif defined GNULIB_POSIXCHECK +# undef rawmemchr +# define rawmemchr(a,b) \ + (GL_LINK_WARNING ("rawmemchr is unportable - " \ + "use gnulib module rawmemchr for portability"), \ + rawmemchr (a, b)) +#endif + /* Copy SRC to DST, returning the address of the terminating '\0' in DST. */ #if @GNULIB_STPCPY@ # if ! @HAVE_STPCPY@ @@ -151,7 +171,11 @@ extern char *strchrnul (char const *__s, int __c_in) /* Duplicate S, returning an identical malloc'd string. */ #if @GNULIB_STRDUP@ -# if ! @HAVE_DECL_STRDUP@ && ! defined strdup +# if @REPLACE_STRDUP@ +# undef strdup +# define strdup rpl_strdup +# endif +# if !(@HAVE_DECL_STRDUP@ || defined strdup) || @REPLACE_STRDUP@ extern char *strdup (char const *__s); # endif #elif defined GNULIB_POSIXCHECK @@ -562,6 +586,18 @@ extern char *strsignal (int __sig); strsignal (a)) #endif +#if @GNULIB_STRVERSCMP@ +# if !@HAVE_STRVERSCMP@ +extern int strverscmp (const char *, const char *); +# endif +#elif defined GNULIB_POSIXCHECK +# undef strverscmp +# define strverscmp(a, b) \ + (GL_LINK_WARNING ("strverscmp is unportable - " \ + "use gnulib module strverscmp for portability"), \ + strverscmp (a, b)) +#endif + #ifdef __cplusplus } diff --git a/lib/strings.in.h b/lib/strings.in.h index 9511752..33070df 100644 --- a/lib/strings.in.h +++ b/lib/strings.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute . - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ #ifndef _GL_STRINGS_H +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_STRINGS_H@ diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index e28412f..74a8d51 100644 --- a/lib/sys_stat.in.h +++ b/lib/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) 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2005-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,18 @@ incomplete. It is intended to provide definitions and prototypes needed by an application. Start with what the system provides. */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + +#if defined __need_system_sys_stat_h +/* Special invocation convention. */ + +#@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@ + +#else +/* Normal invocation convention. */ + #ifndef _GL_SYS_STAT_H /* The include_next requires a split double-inclusion guard. */ @@ -31,6 +43,14 @@ #ifndef _GL_SYS_STAT_H #define _GL_SYS_STAT_H +/* The definition of GL_LINK_WARNING is copied here. */ + +/* Before doing "#define mkdir rpl_mkdir" below, we need to include all + headers that may declare mkdir(). */ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# include +#endif + #ifndef S_IFMT # define S_IFMT 0170000 #endif @@ -257,17 +277,34 @@ # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #endif +#if @GNULIB_LSTAT@ +# if ! @HAVE_LSTAT@ /* mingw does not support symlinks, therefore it does not have lstat. But without links, stat does just fine. */ -#if ! @HAVE_LSTAT@ -# define lstat stat +# define lstat stat +# elif @REPLACE_LSTAT@ +# undef lstat +# define lstat rpl_lstat +extern int rpl_lstat (const char *name, struct stat *buf); +# endif +#elif defined GNULIB_POSIXCHECK +# undef lstat +# define lstat(p,b) \ + (GL_LINK_WARNING ("lstat is unportable - " \ + "use gnulib module lstat for portability"), \ + lstat (p, b)) #endif + +#if @REPLACE_MKDIR@ +# undef mkdir +# define mkdir rpl_mkdir +extern int mkdir (char const *name, mode_t mode); +#else /* mingw's _mkdir() function has 1 argument, but we pass 2 arguments. Additionally, it declares _mkdir (and depending on compile flags, an - alias mkdir), only in the nonstandard io.h. */ -#if ! @HAVE_DECL_MKDIR@ && @HAVE_IO_H@ -# include + alias mkdir), only in the nonstandard , which is included above. */ +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ static inline int rpl_mkdir (char const *name, mode_t mode) @@ -275,8 +312,37 @@ rpl_mkdir (char const *name, mode_t mode) return _mkdir (name); } -# define mkdir rpl_mkdir +# define mkdir rpl_mkdir +# endif +#endif + + +/* Declare BSD extensions. */ + +#if @GNULIB_LCHMOD@ +/* Change the mode of FILENAME to MODE, without dereferencing it if FILENAME + denotes a symbolic link. */ +# if !@HAVE_LCHMOD@ +/* The lchmod replacement follows symbolic links. Callers should take + this into account; lchmod should be applied only to arguments that + are known to not be symbolic links. On hosts that lack lchmod, + this can lead to race conditions between the check and the + invocation of lchmod, but we know of no workarounds that are + reliable in general. You might try requesting support for lchmod + from your operating system supplier. */ +# define lchmod chmod +# endif +# if 0 /* assume already declared */ +extern int lchmod (const char *filename, mode_t mode); +# endif +#elif defined GNULIB_POSIXCHECK +# undef lchmod +# define lchmod(f,m) \ + (GL_LINK_WARNING ("lchmod is unportable - " \ + "use gnulib module lchmod for portability"), \ + lchmod (f, m)) #endif #endif /* _GL_SYS_STAT_H */ #endif /* _GL_SYS_STAT_H */ +#endif diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 6426793..2a552e1 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a more complete sys/time.h. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ /* Written by Paul Eggert. */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + #if defined _GL_SYS_TIME_H /* Simply delegate to the system's header, without adding anything. */ diff --git a/lib/sysexits.in.h b/lib/sysexits.in.h index 895d31e..73da88d 100644 --- a/lib/sysexits.in.h +++ b/lib/sysexits.in.h @@ -1,5 +1,5 @@ /* exit() exit codes for some BSD system programs. - Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,6 +20,10 @@ #if @HAVE_SYSEXITS_H@ +# if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +# endif + /* IRIX 6.5 has an that defines a macro EX_OK with a nonzero value. Override it. See */ diff --git a/lib/time.in.h b/lib/time.in.h index f506b69..4eb9cc5 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more-standard . - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,6 +18,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + /* Don't get in the way of glibc when it includes time.h merely to declare a few standard symbols, rather than to declare all the symbols. Also, Solaris 8 eventually includes itself diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 0d8aeeb..768d4e6 100644 --- a/lib/unistd.in.h +++ b/lib/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) 2004-2008 Free Software Foundation, Inc. + Copyright (C) 2003-2008 Free Software Foundation, Inc. This 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,10 @@ #ifndef _GL_UNISTD_H +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@ # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ @@ -35,6 +39,52 @@ /* mingw fails to declare _exit in . */ #include +#if @GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@ +/* Get ssize_t. */ +# include +#endif + +#if @GNULIB_GETHOSTNAME@ +/* Get all possible declarations of gethostname(). */ +# if @UNISTD_H_HAVE_WINSOCK2_H@ +# include +# if !defined _GL_SYS_SOCKET_H +# undef socket +# define socket socket_used_without_including_sys_socket_h +# undef connect +# define connect connect_used_without_including_sys_socket_h +# undef accept +# define accept accept_used_without_including_sys_socket_h +# undef bind +# define bind bind_used_without_including_sys_socket_h +# undef getpeername +# define getpeername getpeername_used_without_including_sys_socket_h +# undef getsockname +# define getsockname getsockname_used_without_including_sys_socket_h +# undef getsockopt +# define getsockopt getsockopt_used_without_including_sys_socket_h +# undef listen +# define listen listen_used_without_including_sys_socket_h +# undef recv +# define recv recv_used_without_including_sys_socket_h +# undef send +# define send send_used_without_including_sys_socket_h +# undef recvfrom +# define recvfrom recvfrom_used_without_including_sys_socket_h +# undef sendto +# define sendto sendto_used_without_including_sys_socket_h +# undef setsockopt +# define setsockopt setsockopt_used_without_including_sys_socket_h +# undef shutdown +# define shutdown shutdown_used_without_including_sys_socket_h +# endif +# if !defined _GL_SYS_SELECT_H +# undef select +# define select select_used_without_including_sys_select_h +# endif +# endif +#endif + /* The definition of GL_LINK_WARNING is copied here. */ @@ -70,6 +120,29 @@ extern int chown (const char *file, uid_t uid, gid_t gid); #endif +#if @GNULIB_CLOSE@ +# if @UNISTD_H_HAVE_WINSOCK2_H@ +/* Need a gnulib internal function. */ +# define HAVE__GL_CLOSE_FD_MAYBE_SOCKET 1 +# endif +# if @REPLACE_CLOSE@ +/* Automatically included by modules that need a replacement for close. */ +# undef close +# define close rpl_close +extern int close (int); +# endif +#elif @UNISTD_H_HAVE_WINSOCK2_H@ +# undef close +# define close close_used_without_requesting_gnulib_module_close +#elif defined GNULIB_POSIXCHECK +# undef close +# define close(f) \ + (GL_LINK_WARNING ("close does not portably work on sockets - " \ + "use gnulib module close for portability"), \ + close (f)) +#endif + + #if @GNULIB_DUP2@ # if !@HAVE_DUP2@ /* Copy the file descriptor OLDFD into file descriptor NEWFD. Do nothing if @@ -108,6 +181,21 @@ extern char **environ; #endif +#if @GNULIB_EUIDACCESS@ +# if !@HAVE_EUIDACCESS@ +/* Like access(), except that is uses the effective user id and group id of + the current process. */ +extern int euidaccess (const char *filename, int mode); +# endif +#elif defined GNULIB_POSIXCHECK +# undef euidaccess +# define euidaccess(f,m) \ + (GL_LINK_WARNING ("euidaccess is unportable - " \ + "use gnulib module euidaccess for portability"), \ + euidaccess (f, m)) +#endif + + #if @GNULIB_FCHDIR@ # if @REPLACE_FCHDIR@ @@ -118,8 +206,6 @@ extern char **environ; . */ extern int fchdir (int /*fd*/); -# define close rpl_close -extern int close (int); # define dup rpl_dup extern int dup (int); # define dup2 rpl_dup2 @@ -135,6 +221,23 @@ extern int dup2 (int, int); #endif +#if @GNULIB_FSYNC@ +/* Synchronize changes to a file. + Return 0 if successful, otherwise -1 and errno set. + See POSIX:2001 specification + . */ +# if !@HAVE_FSYNC@ +extern int fsync (int fd); +# endif +#elif defined GNULIB_POSIXCHECK +# undef fsync +# define fsync(fd) \ + (GL_LINK_WARNING ("fsync is unportable - " \ + "use gnulib module fsync for portability"), \ + fsync (fd)) +#endif + + #if @GNULIB_FTRUNCATE@ # if !@HAVE_FTRUNCATE@ /* Change the size of the file to which FD is opened to become equal to LENGTH. @@ -179,6 +282,70 @@ extern char * getcwd (char *buf, size_t size); #endif +#if @GNULIB_GETDOMAINNAME@ +/* Return the NIS domain name of the machine. + WARNING! The NIS domain name is unrelated to the fully qualified host name + of the machine. It is also unrelated to email addresses. + WARNING! The NIS domain name is usually the empty string or "(none)" when + not using NIS. + + Put up to LEN bytes of the NIS domain name into NAME. + Null terminate it if the name is shorter than LEN. + If the NIS domain name is longer than LEN, set errno = EINVAL and return -1. + Return 0 if successful, otherwise set errno and return -1. */ +# if !@HAVE_GETDOMAINNAME@ +extern int getdomainname(char *name, size_t len); +# endif +#elif defined GNULIB_POSIXCHECK +# undef getdomainname +# define getdomainname(n,l) \ + (GL_LINK_WARNING ("getdomainname is unportable - " \ + "use gnulib module getdomainname for portability"), \ + getdomainname (n, l)) +#endif + + +#if @GNULIB_GETDTABLESIZE@ +# if !@HAVE_GETDTABLESIZE@ +/* Return the maximum number of file descriptors in the current process. */ +extern int getdtablesize (void); +# endif +#elif defined GNULIB_POSIXCHECK +# undef getdtablesize +# define getdtablesize() \ + (GL_LINK_WARNING ("getdtablesize is unportable - " \ + "use gnulib module getdtablesize for portability"), \ + getdtablesize ()) +#endif + + +#if @GNULIB_GETHOSTNAME@ +/* Return the standard host name of the machine. + WARNING! The host name may or may not be fully qualified. + + Put up to LEN bytes of the host name into NAME. + Null terminate it if the name is shorter than LEN. + If the host name is longer than LEN, set errno = EINVAL and return -1. + Return 0 if successful, otherwise set errno and return -1. */ +# if @UNISTD_H_HAVE_WINSOCK2_H@ +# undef gethostname +# define gethostname rpl_gethostname +# endif +# if @UNISTD_H_HAVE_WINSOCK2_H@ || !@HAVE_GETHOSTNAME@ +extern int gethostname(char *name, size_t len); +# endif +#elif @UNISTD_H_HAVE_WINSOCK2_H@ +# undef gethostname +# define gethostname gethostname_used_without_requesting_gnulib_module_gethostname +#elif defined GNULIB_POSIXCHECK +# undef gethostname +# define gethostname(n,l) \ + (GL_LINK_WARNING ("gethostname is unportable - " \ + "use gnulib module gethostname for portability"), \ + gethostname (n, l)) +#endif + + #if @GNULIB_GETLOGIN_R@ /* Copies the user's login name to NAME. The array pointed to by NAME has room for SIZE bytes. @@ -260,6 +427,36 @@ extern int getpagesize (void); #endif +#if @GNULIB_GETUSERSHELL@ +# if !@HAVE_GETUSERSHELL@ +/* Return the next valid login shell on the system, or NULL when the end of + the list has been reached. */ +extern char *getusershell (void); +/* Rewind to pointer that is advanced at each getusershell() call. */ +extern void setusershell (void); +/* Free the pointer that is advanced at each getusershell() call and + associated resources. */ +extern void endusershell (void); +# endif +#elif defined GNULIB_POSIXCHECK +# undef getusershell +# define getusershell() \ + (GL_LINK_WARNING ("getusershell is unportable - " \ + "use gnulib module getusershell for portability"), \ + getusershell ()) +# undef setusershell +# define setusershell() \ + (GL_LINK_WARNING ("setusershell is unportable - " \ + "use gnulib module getusershell for portability"), \ + setusershell ()) +# undef endusershell +# define endusershell() \ + (GL_LINK_WARNING ("endusershell is unportable - " \ + "use gnulib module getusershell for portability"), \ + endusershell ()) +#endif + + #if @GNULIB_LCHOWN@ # if @REPLACE_LCHOWN@ /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE @@ -333,6 +530,22 @@ extern unsigned int sleep (unsigned int n); #endif +#if @GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@ +/* Write up to COUNT bytes starting at BUF to file descriptor FD. + See the POSIX:2001 specification + . */ +# undef write +# define write rpl_write +extern ssize_t write (int fd, const void *buf, size_t count); +#endif + + +#ifdef FCHDIR_REPLACEMENT +/* gnulib internal function. */ +extern void _gl_unregister_fd (int fd); +#endif + + #ifdef __cplusplus } #endif diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c index 3e0d30a..29aaf2a 100644 --- a/lib/uniwidth/width.c +++ b/lib/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-2007 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -38,7 +38,7 @@ static const unsigned char nonspacing_table_data[22*64] = { /* 0x0000-0x01ff */ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */ - 0xff, 0xff, 0xff, 0xff, 0x00, 0x08, 0x00, 0x00, /* 0x0080-0x00bf */ + 0xff, 0xff, 0xff, 0xff, 0x00, 0x20, 0x00, 0x00, /* 0x0080-0x00bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00c0-0x00ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x013f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0140-0x017f */ diff --git a/lib/utimens.c b/lib/utimens.c index e128219..708de10 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -94,89 +95,127 @@ gl_futimens (int fd ATTRIBUTE_UNUSED, fsync (fd); #endif - /* There's currently no interface to set file timestamps with - nanosecond resolution, so do the best we can, discarding any - fractional part of the timestamp. */ -#if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES - struct timeval timeval[2]; - struct timeval const *t; - if (timespec) + /* POSIX 200x added two interfaces to set file timestamps with + nanosecond resolution. We provide a fallback for ENOSYS (for + example, compiling against Linux 2.6.25 kernel headers and glibc + 2.7, but running on Linux 2.6.18 kernel). */ +#if HAVE_UTIMENSAT + if (fd < 0) { - timeval[0].tv_sec = timespec[0].tv_sec; - timeval[0].tv_usec = timespec[0].tv_nsec / 1000; - timeval[1].tv_sec = timespec[1].tv_sec; - timeval[1].tv_usec = timespec[1].tv_nsec / 1000; - t = timeval; + int result = utimensat (AT_FDCWD, file, timespec, 0); +# ifdef __linux__ + /* Work around what might be a kernel bug: + http://bugzilla.redhat.com/442352 + http://bugzilla.redhat.com/449910 + It appears that utimensat can mistakenly return 280 rather + than -1 upon failure. + FIXME: remove in 2010 or whenever the offending kernels + are no longer in common use. */ + if (0 < result) + errno = ENOSYS; +# endif + + if (result == 0 || errno != ENOSYS) + return result; } - else - t = NULL; +#endif +#if HAVE_FUTIMENS + { + int result = futimens (fd, timespec); +# ifdef __linux__ + /* Work around the same bug as above. */ + if (0 < result) + errno = ENOSYS; +# endif + if (result == 0 || errno != ENOSYS) + return result; + } +#endif + /* The platform lacks an interface to set file timestamps with + nanosecond resolution, so do the best we can, discarding any + fractional part of the timestamp. */ + { +#if HAVE_FUTIMESAT || HAVE_WORKING_UTIMES + struct timeval timeval[2]; + struct timeval const *t; + if (timespec) + { + timeval[0].tv_sec = timespec[0].tv_sec; + timeval[0].tv_usec = timespec[0].tv_nsec / 1000; + timeval[1].tv_sec = timespec[1].tv_sec; + timeval[1].tv_usec = timespec[1].tv_nsec / 1000; + t = timeval; + } + else + t = NULL; - if (fd < 0) - { + if (fd < 0) + { # if HAVE_FUTIMESAT - return futimesat (AT_FDCWD, file, t); + return futimesat (AT_FDCWD, file, t); # endif - } - else - { - /* If futimesat or futimes fails here, don't try to speed things - up by returning right away. glibc can incorrectly fail with - errno == ENOENT if /proc isn't mounted. Also, Mandrake 10.0 - in high security mode doesn't allow ordinary users to read - /proc/self, so glibc incorrectly fails with errno == EACCES. - If errno == EIO, EPERM, or EROFS, it's probably safe to fail - right away, but these cases are rare enough that they're not - worth optimizing, and who knows what other messed-up systems - are out there? So play it safe and fall back on the code - below. */ + } + else + { + /* If futimesat or futimes fails here, don't try to speed things + up by returning right away. glibc can incorrectly fail with + errno == ENOENT if /proc isn't mounted. Also, Mandrake 10.0 + in high security mode doesn't allow ordinary users to read + /proc/self, so glibc incorrectly fails with errno == EACCES. + If errno == EIO, EPERM, or EROFS, it's probably safe to fail + right away, but these cases are rare enough that they're not + worth optimizing, and who knows what other messed-up systems + are out there? So play it safe and fall back on the code + below. */ # if HAVE_FUTIMESAT - if (futimesat (fd, NULL, t) == 0) - return 0; + if (futimesat (fd, NULL, t) == 0) + return 0; # elif HAVE_FUTIMES - if (futimes (fd, t) == 0) - return 0; + if (futimes (fd, t) == 0) + return 0; # endif - } -#endif + } +#endif /* HAVE_FUTIMESAT || HAVE_WORKING_UTIMES */ - if (!file) - { + if (!file) + { #if ! (HAVE_FUTIMESAT || (HAVE_WORKING_UTIMES && HAVE_FUTIMES)) - errno = ENOSYS; + errno = ENOSYS; #endif - /* Prefer EBADF to ENOSYS if both error numbers apply. */ - if (errno == ENOSYS) - { - int fd2 = dup (fd); - int dup_errno = errno; - if (0 <= fd2) - close (fd2); - errno = (fd2 < 0 && dup_errno == EBADF ? EBADF : ENOSYS); - } - - return -1; - } + /* Prefer EBADF to ENOSYS if both error numbers apply. */ + if (errno == ENOSYS) + { + int fd2 = dup (fd); + int dup_errno = errno; + if (0 <= fd2) + close (fd2); + errno = (fd2 < 0 && dup_errno == EBADF ? EBADF : ENOSYS); + } + + return -1; + } #if HAVE_WORKING_UTIMES - return utimes (file, t); + return utimes (file, t); #else - { - struct utimbuf utimbuf; - struct utimbuf const *ut; - if (timespec) - { - utimbuf.actime = timespec[0].tv_sec; - utimbuf.modtime = timespec[1].tv_sec; - ut = &utimbuf; - } - else - ut = NULL; + { + struct utimbuf utimbuf; + struct utimbuf const *ut; + if (timespec) + { + utimbuf.actime = timespec[0].tv_sec; + utimbuf.modtime = timespec[1].tv_sec; + ut = &utimbuf; + } + else + ut = NULL; - return utime (file, ut); + return utime (file, ut); + } +#endif /* !HAVE_WORKING_UTIMES */ } -#endif } /* Set the access and modification time stamps of FILE to be diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 3bdb4e9..426b7c5 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -97,7 +97,7 @@ #if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL # include -# include "isnand.h" +# include "isnand-nolibm.h" #endif #if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined IN_LIBINTL @@ -108,7 +108,7 @@ #if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL # include -# include "isnand.h" +# include "isnand-nolibm.h" # include "printf-frexp.h" #endif @@ -179,10 +179,12 @@ local_wcslen (const wchar_t *s) # endif #else /* TCHAR_T is char. */ -# /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. + /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. But don't use it on BeOS, since BeOS snprintf produces no output if the - size argument is >= 0x3000000. */ -# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ + size argument is >= 0x3000000. + Also don't use it on Linux libc5, since there snprintf with size = 1 + writes any output without bounds, like sprintf. */ +# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ && !(__GNU_LIBRARY__ == 1) # define USE_SNPRINTF 1 # else # define USE_SNPRINTF 0 @@ -200,7 +202,22 @@ local_wcslen (const wchar_t *s) /* Here we need to call the native sprintf, not rpl_sprintf. */ #undef sprintf -#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL +/* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized" + warnings in this file. Use -Dlint to suppress them. */ +#ifdef lint +# define IF_LINT(Code) Code +#else +# define IF_LINT(Code) /* empty */ +#endif + +/* Avoid some warnings from "gcc -Wshadow". + This file doesn't use the exp() and remainder() functions. */ +#undef exp +#define exp expo +#undef remainder +#define remainder rem + +#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL /* Determine the decimal-point character according to the current locale. */ # ifndef decimal_point_char_defined # define decimal_point_char_defined 1 @@ -240,11 +257,11 @@ is_infinite_or_zero (double x) #if NEED_PRINTF_INFINITE_LONG_DOUBLE && !NEED_PRINTF_LONG_DOUBLE && !defined IN_LIBINTL -/* Equivalent to !isfinite(x), but does not require libm. */ +/* Equivalent to !isfinite(x) || x == 0, but does not require libm. */ static int -is_infinitel (long double x) +is_infinite_or_zerol (long double x) { - return isnanl (x) || (x + x == x && x != 0.0L); + return isnanl (x) || x + x == x; } #endif @@ -1198,7 +1215,7 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n) static char * scale10_round_decimal_long_double (long double x, int n) { - int e; + int e IF_LINT(= 0); mpn_t m; void *memory = decode_long_double (x, &e, &m); return scale10_round_decimal_decoded (e, m, memory, n); @@ -1216,7 +1233,7 @@ scale10_round_decimal_long_double (long double x, int n) static char * scale10_round_decimal_double (double x, int n) { - int e; + int e IF_LINT(= 0); mpn_t m; void *memory = decode_double (x, &e, &m); return scale10_round_decimal_decoded (e, m, memory, n); @@ -1303,9 +1320,9 @@ floorlog10l (long double x) } /* Now 0.95 <= z <= 1.01. */ z = 1 - z; - /* log(1-z) = - z - z^2/2 - z^3/3 - z^4/4 - ... + /* log2(1-z) = 1/log(2) * (- z - z^2/2 - z^3/3 - z^4/4 - ...) Four terms are enough to get an approximation with error < 10^-7. */ - l -= z * (1.0 + z * (0.5 + z * ((1.0 / 3) + z * 0.25))); + l -= 1.4426950408889634074 * z * (1.0 + z * (0.5 + z * ((1.0 / 3) + z * 0.25))); /* Finally multiply with log(2)/log(10), yields an approximation for log10(x). */ l *= 0.30102999566398119523; @@ -1394,9 +1411,9 @@ floorlog10 (double x) } /* Now 0.95 <= z <= 1.01. */ z = 1 - z; - /* log(1-z) = - z - z^2/2 - z^3/3 - z^4/4 - ... + /* log2(1-z) = 1/log(2) * (- z - z^2/2 - z^3/3 - z^4/4 - ...) Four terms are enough to get an approximation with error < 10^-7. */ - l -= z * (1.0 + z * (0.5 + z * ((1.0 / 3) + z * 0.25))); + l -= 1.4426950408889634074 * z * (1.0 + z * (0.5 + z * ((1.0 / 3) + z * 0.25))); /* Finally multiply with log(2)/log(10), yields an approximation for log10(x). */ l *= 0.30102999566398119523; @@ -1406,6 +1423,20 @@ floorlog10 (double x) # endif +/* Tests whether a string of digits consists of exactly PRECISION zeroes and + a single '1' digit. */ +static int +is_borderline (const char *digits, size_t precision) +{ + for (; precision > 0; precision--, digits++) + if (*digits != '0') + return 0; + if (*digits != '1') + return 0; + digits++; + return *digits == '\0'; +} + #endif DCHAR_T * @@ -2549,8 +2580,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, # elif NEED_PRINTF_INFINITE_LONG_DOUBLE || (a.arg[dp->arg_index].type == TYPE_LONGDOUBLE /* Some systems produce wrong output for Inf, - -Inf, and NaN. */ - && is_infinitel (a.arg[dp->arg_index].a.a_longdouble)) + -Inf, and NaN. Some systems in this category + (IRIX 5.3) also do so for -0.0. Therefore we + treat this case here as well. */ + && is_infinite_or_zerol (a.arg[dp->arg_index].a.a_longdouble)) # endif )) { @@ -2632,9 +2665,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* POSIX specifies the default precision to be 6 for %f, %F, %e, %E, but not for %g, %G. Implementations appear to use - the same default precision also for %g, %G. */ + the same default precision also for %g, %G. But for %a, %A, + the default precision is 0. */ if (!has_precision) - precision = 6; + if (!(dp->conversion == 'a' || dp->conversion == 'A')) + precision = 6; /* Allocate a temporary buffer of sufficient size. */ # if NEED_PRINTF_DOUBLE && NEED_PRINTF_LONG_DOUBLE @@ -2855,8 +2890,32 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, exponent += 1; adjusted = 1; } - /* Here ndigits = precision+1. */ + if (is_borderline (digits, precision)) + { + /* Maybe the exponent guess was too high + and a smaller exponent can be reached + by turning a 10...0 into 9...9x. */ + char *digits2 = + scale10_round_decimal_long_double (arg, + (int)precision - exponent + 1); + if (digits2 == NULL) + { + free (digits); + END_LONG_DOUBLE_ROUNDING (); + goto out_of_memory; + } + if (strlen (digits2) == precision + 1) + { + free (digits); + digits = digits2; + exponent -= 1; + } + else + free (digits2); + } + /* Here ndigits = precision+1. */ + *p++ = digits[--ndigits]; if ((flags & FLAG_ALT) || precision > 0) { @@ -2968,6 +3027,30 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, adjusted = 1; } /* Here ndigits = precision. */ + if (is_borderline (digits, precision - 1)) + { + /* Maybe the exponent guess was too high + and a smaller exponent can be reached + by turning a 10...0 into 9...9x. */ + char *digits2 = + scale10_round_decimal_long_double (arg, + (int)(precision - 1) - exponent + 1); + if (digits2 == NULL) + { + free (digits); + END_LONG_DOUBLE_ROUNDING (); + goto out_of_memory; + } + if (strlen (digits2) == precision) + { + free (digits); + digits = digits2; + exponent -= 1; + } + else + free (digits2); + } + /* Here ndigits = precision. */ /* Determine the number of trailing zeroes that have to be dropped. */ @@ -3062,7 +3145,65 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, abort (); # else /* arg is finite. */ - abort (); + if (!(arg == 0.0L)) + abort (); + + pad_ptr = p; + + if (dp->conversion == 'f' || dp->conversion == 'F') + { + *p++ = '0'; + if ((flags & FLAG_ALT) || precision > 0) + { + *p++ = decimal_point_char (); + for (; precision > 0; precision--) + *p++ = '0'; + } + } + else if (dp->conversion == 'e' || dp->conversion == 'E') + { + *p++ = '0'; + if ((flags & FLAG_ALT) || precision > 0) + { + *p++ = decimal_point_char (); + for (; precision > 0; precision--) + *p++ = '0'; + } + *p++ = dp->conversion; /* 'e' or 'E' */ + *p++ = '+'; + *p++ = '0'; + *p++ = '0'; + } + else if (dp->conversion == 'g' || dp->conversion == 'G') + { + *p++ = '0'; + if (flags & FLAG_ALT) + { + size_t ndigits = + (precision > 0 ? precision - 1 : 0); + *p++ = decimal_point_char (); + for (; ndigits > 0; --ndigits) + *p++ = '0'; + } + } + else if (dp->conversion == 'a' || dp->conversion == 'A') + { + *p++ = '0'; + *p++ = dp->conversion - 'A' + 'X'; + pad_ptr = p; + *p++ = '0'; + if ((flags & FLAG_ALT) || precision > 0) + { + *p++ = decimal_point_char (); + for (; precision > 0; precision--) + *p++ = '0'; + } + *p++ = dp->conversion - 'A' + 'P'; + *p++ = '+'; + *p++ = '0'; + } + else + abort (); # endif } @@ -3208,8 +3349,31 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, exponent += 1; adjusted = 1; } - /* Here ndigits = precision+1. */ + if (is_borderline (digits, precision)) + { + /* Maybe the exponent guess was too high + and a smaller exponent can be reached + by turning a 10...0 into 9...9x. */ + char *digits2 = + scale10_round_decimal_double (arg, + (int)precision - exponent + 1); + if (digits2 == NULL) + { + free (digits); + goto out_of_memory; + } + if (strlen (digits2) == precision + 1) + { + free (digits); + digits = digits2; + exponent -= 1; + } + else + free (digits2); + } + /* Here ndigits = precision+1. */ + *p++ = digits[--ndigits]; if ((flags & FLAG_ALT) || precision > 0) { @@ -3334,6 +3498,29 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, adjusted = 1; } /* Here ndigits = precision. */ + if (is_borderline (digits, precision - 1)) + { + /* Maybe the exponent guess was too high + and a smaller exponent can be reached + by turning a 10...0 into 9...9x. */ + char *digits2 = + scale10_round_decimal_double (arg, + (int)(precision - 1) - exponent + 1); + if (digits2 == NULL) + { + free (digits); + goto out_of_memory; + } + if (strlen (digits2) == precision) + { + free (digits); + digits = digits2; + exponent -= 1; + } + else + free (digits2); + } + /* Here ndigits = precision. */ /* Determine the number of trailing zeroes that have to be dropped. */ @@ -3585,7 +3772,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #endif TCHAR_T *fbp; unsigned int prefix_count; - int prefixes[2]; + int prefixes[2] IF_LINT (= { 0 }); #if !USE_SNPRINTF size_t tmp_length; TCHAR_T tmpbuf[700]; @@ -4053,7 +4240,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, abort (); prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int; } - if (dp->precision_arg_index != ARG_NONE) + if (!prec_ourselves && dp->precision_arg_index != ARG_NONE) { if (!(a.arg[dp->precision_arg_index].type == TYPE_INT)) abort (); diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 52d63f8..dcb87b9 100644 --- a/lib/wchar.in.h +++ b/lib/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 Free Software Foundation, Inc. + Copyright (C) 2007-2008 Free Software Foundation, Inc. This 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,8 +28,12 @@ * the declaration of wcwidth(). */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + #ifdef __need_mbstate_t -/* Special invocation convention inside glibc header files. */ +/* Special invocation convention inside uClibc header files. */ #@INCLUDE_NEXT@ @NEXT_WCHAR_H@ @@ -63,6 +67,12 @@ extern "C" { #endif +/* Define wint_t. (Also done in wctype.in.h.) */ +#if !@HAVE_WINT_T@ && !defined wint_t +# define wint_t int +#endif + + /* Return the number of screen columns needed for WC. */ #if @GNULIB_WCWIDTH@ # if @REPLACE_WCWIDTH@ diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 1691bd8..4a4f5a0 100644 --- a/lib/wctype.in.h +++ b/lib/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, 2007 Free Software Foundation, Inc. + Copyright (C) 2006-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +30,10 @@ #ifndef _GL_WCTYPE_H +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + #if @HAVE_WINT_T@ /* Solaris 2.5 has a bug: must be included before . Tru64 with Desktop Toolkit C has a bug: must be included before @@ -52,15 +56,15 @@ #ifndef _GL_WCTYPE_H #define _GL_WCTYPE_H -#if @HAVE_WINT_T@ -typedef wint_t __wctype_wint_t; -#else -typedef int __wctype_wint_t; +/* Define wint_t. (Also done in wchar.in.h.) */ +#if !@HAVE_WINT_T@ && !defined wint_t +# define wint_t int #endif /* FreeBSD 4.4 to 4.11 has but lacks the functions. + Linux libc5 has and the functions but they are broken. Assume all 12 functions are implemented the same way, or not at all. */ -#if ! @HAVE_ISWCNTRL@ +#if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ /* IRIX 5.3 has macros but no functions, its isw* macros refer to an undefined variable _ctmp_ and to macros like _P, and they @@ -80,57 +84,73 @@ typedef int __wctype_wint_t; # undef iswupper # undef iswxdigit +/* Linux libc5 has and the functions but they are broken. */ +# if @REPLACE_ISWCNTRL@ +# define iswalnum rpl_iswalnum +# define iswalpha rpl_iswalpha +# define iswblank rpl_iswblank +# define iswcntrl rpl_iswcntrl +# define iswdigit rpl_iswdigit +# define iswgraph rpl_iswgraph +# define iswlower rpl_iswlower +# define iswprint rpl_iswprint +# define iswpunct rpl_iswpunct +# define iswspace rpl_iswspace +# define iswupper rpl_iswupper +# define iswxdigit rpl_iswxdigit +# endif + static inline int -iswalnum (__wctype_wint_t wc) +iswalnum (wint_t wc) { return ((wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')); } static inline int -iswalpha (__wctype_wint_t wc) +iswalpha (wint_t wc) { return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } static inline int -iswblank (__wctype_wint_t wc) +iswblank (wint_t wc) { return wc == ' ' || wc == '\t'; } static inline int -iswcntrl (__wctype_wint_t wc) +iswcntrl (wint_t wc) { return (wc & ~0x1f) == 0 || wc == 0x7f; } static inline int -iswdigit (__wctype_wint_t wc) +iswdigit (wint_t wc) { return wc >= '0' && wc <= '9'; } static inline int -iswgraph (__wctype_wint_t wc) +iswgraph (wint_t wc) { return wc >= '!' && wc <= '~'; } static inline int -iswlower (__wctype_wint_t wc) +iswlower (wint_t wc) { return wc >= 'a' && wc <= 'z'; } static inline int -iswprint (__wctype_wint_t wc) +iswprint (wint_t wc) { return wc >= ' ' && wc <= '~'; } static inline int -iswpunct (__wctype_wint_t wc) +iswpunct (wint_t wc) { return (wc >= '!' && wc <= '~' && !((wc >= '0' && wc <= '9') @@ -138,20 +158,20 @@ iswpunct (__wctype_wint_t wc) } static inline int -iswspace (__wctype_wint_t wc) +iswspace (wint_t wc) { return (wc == ' ' || wc == '\t' || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r'); } static inline int -iswupper (__wctype_wint_t wc) +iswupper (wint_t wc) { return wc >= 'A' && wc <= 'Z'; } static inline int -iswxdigit (__wctype_wint_t wc) +iswxdigit (wint_t wc) { return ((wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')); diff --git a/lib/write.c b/lib/write.c new file mode 100644 index 0000000..250b5cc --- /dev/null +++ b/lib/write.c @@ -0,0 +1,62 @@ +/* POSIX compatible write() function. + Copyright (C) 2008 Free Software Foundation, Inc. + Written by Bruno Haible , 2008. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +/* Replace this function only if module 'sigpipe' is requested. */ +#if GNULIB_SIGPIPE + +/* On native Windows platforms, SIGPIPE does not exist. When write() is + called on a pipe with no readers, WriteFile() fails with error + GetLastError() = ERROR_NO_DATA, and write() in consequence fails with + error EINVAL. */ + +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + +# include +# include +# include + +# define WIN32_LEAN_AND_MEAN /* avoid including junk */ +# include + +ssize_t +rpl_write (int fd, const void *buf, size_t count) +#undef write +{ + ssize_t ret = write (fd, buf, count); + + if (ret < 0) + { + if (GetLastError () == ERROR_NO_DATA + && GetFileType (_get_osfhandle (fd)) == FILE_TYPE_PIPE) + { + /* Try to raise signal SIGPIPE. */ + raise (SIGPIPE); + /* If it is currently blocked or ignored, change errno from EINVAL + to EPIPE. */ + errno = EPIPE; + } + } + return ret; +} + +# endif +#endif diff --git a/lib/xalloc.h b/lib/xalloc.h index 40dcf4b..57a13e0 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -37,6 +37,14 @@ extern "C" { # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) # endif +# ifndef ATTRIBUTE_MALLOC +# if __GNUC__ >= 3 +# define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) +# else +# define ATTRIBUTE_MALLOC +# endif +# endif + /* This function is always triggered when memory is exhausted. It must be defined by the application, either explicitly or by using gnulib's xalloc-die module. This is the @@ -44,13 +52,13 @@ extern "C" { memory allocation failure. */ extern void xalloc_die (void) ATTRIBUTE_NORETURN; -void *xmalloc (size_t s); -void *xzalloc (size_t s); -void *xcalloc (size_t n, size_t s); +void *xmalloc (size_t s) ATTRIBUTE_MALLOC; +void *xzalloc (size_t s) ATTRIBUTE_MALLOC; +void *xcalloc (size_t n, size_t s) ATTRIBUTE_MALLOC; void *xrealloc (void *p, size_t s); void *x2realloc (void *p, size_t *pn); -void *xmemdup (void const *p, size_t s); -char *xstrdup (char const *str); +void *xmemdup (void const *p, size_t s) ATTRIBUTE_MALLOC; +char *xstrdup (char const *str) ATTRIBUTE_MALLOC; /* Return 1 if an array of N objects, each of size S, cannot exist due to size arithmetic overflow. S must be positive and N must be @@ -97,10 +105,10 @@ char *xstrdup (char const *str); # if HAVE_INLINE # define static_inline static inline # else - void *xnmalloc (size_t n, size_t s); + void *xnmalloc (size_t n, size_t s) ATTRIBUTE_MALLOC; void *xnrealloc (void *p, size_t n, size_t s); void *x2nrealloc (void *p, size_t *pn, size_t s); - char *xcharalloc (size_t n); + char *xcharalloc (size_t n) ATTRIBUTE_MALLOC; # endif # ifdef static_inline @@ -108,6 +116,7 @@ char *xstrdup (char const *str); /* Allocate an array of N objects, each with S bytes of memory, dynamically, with error checking. S must be nonzero. */ +static_inline void *xnmalloc (size_t n, size_t s) ATTRIBUTE_MALLOC; static_inline void * xnmalloc (size_t n, size_t s) { @@ -219,6 +228,7 @@ x2nrealloc (void *p, size_t *pn, size_t s) /* Return a pointer to a new buffer of N bytes. This is like xmalloc, except it returns char *. */ +static_inline char *xcharalloc (size_t n) ATTRIBUTE_MALLOC; static_inline char * xcharalloc (size_t n) { diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 3a12345..89ecf17 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,7 +1,7 @@ /* xmalloc.c -- malloc with out of memory checking Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, + 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/m4/close.m4 b/m4/close.m4 new file mode 100644 index 0000000..fcc9fb1 --- /dev/null +++ b/m4/close.m4 @@ -0,0 +1,25 @@ +# close.m4 serial 2 +dnl Copyright (C) 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_CLOSE], +[ + m4_ifdef([gl_PREREQ_SYS_H_WINSOCK2], [ + gl_PREREQ_SYS_H_WINSOCK2 + if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then + gl_REPLACE_CLOSE + fi + ]) +]) + +AC_DEFUN([gl_REPLACE_CLOSE], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + if test $REPLACE_CLOSE != 1; then + AC_LIBOBJ([close]) + fi + REPLACE_CLOSE=1 + gl_REPLACE_FCLOSE +]) diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 new file mode 100644 index 0000000..a72fc36 --- /dev/null +++ b/m4/dirent_h.m4 @@ -0,0 +1,39 @@ +# dirent_h.m4 serial 2 +dnl Copyright (C) 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Written by Bruno Haible. + +AC_DEFUN([gl_DIRENT_H], +[ + dnl Use AC_REQUIRE here, so that the default behavior below is expanded + dnl once only, before all statements that occur in other macros. + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([dirent.h]) +]) + +dnl Unconditionally enables the replacement of . +AC_DEFUN([gl_REPLACE_DIRENT_H], +[ + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + DIRENT_H='dirent.h' +]) + +AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 +]) + +AC_DEFUN([gl_DIRENT_H_DEFAULTS], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR + GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_DIRFD=1; AC_SUBST([HAVE_DECL_DIRFD]) + DIRENT_H=''; AC_SUBST([DIRENT_H]) +]) diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index 125966b..baab4dd 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,8 +1,8 @@ -#serial 14 -*- Autoconf -*- +#serial 15 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software +# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,13 +12,23 @@ dnl From Jim Meyering AC_DEFUN([gl_FUNC_DIRFD], [ + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + gl_REPLACE_DIRENT_H + + dnl Persuade glibc to declare dirfd(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. AC_REQUIRE([AC_PROG_CPP]) AC_REQUIRE([AC_PROG_EGREP]) + AC_CHECK_FUNCS(dirfd) AC_CHECK_DECLS([dirfd], , , [#include #include ]) + if test $ac_cv_have_decl_dirfd = no; then + HAVE_DECL_DIRFD=0 + fi AC_CACHE_CHECK([whether dirfd is a macro], gl_cv_func_dirfd_macro, diff --git a/m4/eoverflow.m4 b/m4/eoverflow.m4 deleted file mode 100644 index 3bffd10..0000000 --- a/m4/eoverflow.m4 +++ /dev/null @@ -1,70 +0,0 @@ -# eoverflow.m4 serial 2 -dnl Copyright (C) 2004, 2006 Free Software Foundation, Inc. -dnl This file is free software; the Free 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 Bruno Haible. - -# The EOVERFLOW errno value ought to be defined in , according to -# POSIX. But some systems (like AIX 3) don't define it, and some systems -# (like OSF/1) define it when _XOPEN_SOURCE_EXTENDED is defined. - -# Define EOVERFLOW as a C macro and as a substituted macro in such a way that -# 1. on all systems, after inclusion of , EOVERFLOW is usable, -# 2. on systems where EOVERFLOW is defined elsewhere, we use the same numeric -# value. - -AC_DEFUN([gl_EOVERFLOW], -[ - AC_REQUIRE([AC_PROG_CC])dnl - - AC_CACHE_CHECK([for EOVERFLOW], ac_cv_decl_EOVERFLOW, [ - AC_EGREP_CPP(yes,[ -#include -#ifdef EOVERFLOW -yes -#endif - ], have_eoverflow=1) - if test -n "$have_eoverflow"; then - dnl EOVERFLOW exists in . Don't need to define EOVERFLOW ourselves. - ac_cv_decl_EOVERFLOW=yes - else - AC_EGREP_CPP(yes,[ -#define _XOPEN_SOURCE_EXTENDED 1 -#include -#ifdef EOVERFLOW -yes -#endif - ], have_eoverflow=1) - if test -n "$have_eoverflow"; then - dnl EOVERFLOW exists but is hidden. - dnl Define it to the same value. - AC_COMPUTE_INT([ac_cv_decl_EOVERFLOW], [EOVERFLOW], [ -#define _XOPEN_SOURCE_EXTENDED 1 -#include -/* The following two lines are a workaround against an autoconf-2.52 bug. */ -#include -#include -]) - else - dnl EOVERFLOW isn't defined by the system. Define EOVERFLOW ourselves, but - dnl don't define it as EINVAL, because snprintf() callers want to - dnl distinguish EINVAL and EOVERFLOW. - ac_cv_decl_EOVERFLOW=E2BIG - fi - fi - ]) - if test "$ac_cv_decl_EOVERFLOW" != yes; then - AC_DEFINE_UNQUOTED([EOVERFLOW], [$ac_cv_decl_EOVERFLOW], - [Define as good substitute value for EOVERFLOW.]) - EOVERFLOW="$ac_cv_decl_EOVERFLOW" - AC_SUBST(EOVERFLOW) - fi -]) - -dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in. -dnl Remove this when we can assume autoconf >= 2.61. -m4_ifdef([AC_COMPUTE_INT], [], [ - AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) -]) diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 new file mode 100644 index 0000000..b5af078 --- /dev/null +++ b/m4/errno_h.m4 @@ -0,0 +1,113 @@ +# errno_h.m4 serial 1 +dnl Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_HEADER_ERRNO_H], +[ + dnl Use AC_REQUIRE here, so that the default behavior below is expanded + dnl once only, before all statements that occur in other macros. + AC_REQUIRE([gl_HEADER_ERRNO_H_BODY]) +]) + +AC_DEFUN([gl_HEADER_ERRNO_H_BODY], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([for complete errno.h], gl_cv_header_errno_h_complete, [ + AC_EGREP_CPP(booboo,[ +#include +#if !defined ENOMSG +booboo +#endif +#if !defined EIDRM +booboo +#endif +#if !defined ENOLINK +booboo +#endif +#if !defined EPROTO +booboo +#endif +#if !defined EMULTIHOP +booboo +#endif +#if !defined EBADMSG +booboo +#endif +#if !defined EOVERFLOW +booboo +#endif +#if !defined ENOTSUP +booboo +#endif +#if !defined ECANCELED +booboo +#endif + ], + [gl_cv_header_errno_h_complete=no], + [gl_cv_header_errno_h_complete=yes]) + ]) + if test $gl_cv_header_errno_h_complete = yes; then + ERRNO_H='' + else + gl_CHECK_NEXT_HEADERS([errno.h]) + ERRNO_H='errno.h' + fi + AC_SUBST([ERRNO_H]) + gl_REPLACE_ERRNO_VALUE([EMULTIHOP]) + gl_REPLACE_ERRNO_VALUE([ENOLINK]) + gl_REPLACE_ERRNO_VALUE([EOVERFLOW]) +]) + +# Assuming $1 = EOVERFLOW. +# The EOVERFLOW errno value ought to be defined in , according to +# POSIX. But some systems (like OpenBSD 4.0 or AIX 3) don't define it, and +# some systems (like OSF/1) define it when _XOPEN_SOURCE_EXTENDED is defined. +# Check for the value of EOVERFLOW. +# Set the variables EOVERFLOW_HIDDEN and EOVERFLOW_VALUE. +AC_DEFUN([gl_REPLACE_ERRNO_VALUE], +[ + if test -n "$ERRNO_H"; then + AC_CACHE_CHECK([for ]$1[ value], [gl_cv_header_errno_h_]$1, [ + AC_EGREP_CPP(yes,[ +#include +#ifdef ]$1[ +yes +#endif + ], + [gl_cv_header_errno_h_]$1[=yes], + [gl_cv_header_errno_h_]$1[=no]) + if test $gl_cv_header_errno_h_]$1[ = no; then + AC_EGREP_CPP(yes,[ +#define _XOPEN_SOURCE_EXTENDED 1 +#include +#ifdef ]$1[ +yes +#endif + ], [gl_cv_header_errno_h_]$1[=hidden]) + if test $gl_cv_header_errno_h_]$1[ = hidden; then + dnl The macro exists but is hidden. + dnl Define it to the same value. + AC_COMPUTE_INT([gl_cv_header_errno_h_]$1, $1, [ +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include +]) + fi + fi + ]) + case $gl_cv_header_errno_h_]$1[ in + yes | no) + ]$1[_HIDDEN=0; ]$1[_VALUE= + ;; + *) + ]$1[_HIDDEN=1; ]$1[_VALUE="$gl_cv_header_errno_h_]$1[" + ;; + esac + AC_SUBST($1[_HIDDEN]) + AC_SUBST($1[_VALUE]) + fi +]) diff --git a/m4/extensions.m4 b/m4/extensions.m4 index bcbb3ce..917af94 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ # serial 5 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,9 +61,9 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], [ac_cv_safe_to_define___extensions__], [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([ + [AC_LANG_PROGRAM([[ # define __EXTENSIONS__ 1 - AC_INCLUDES_DEFAULT])], + ]AC_INCLUDES_DEFAULT])], [ac_cv_safe_to_define___extensions__=yes], [ac_cv_safe_to_define___extensions__=no])]) test $ac_cv_safe_to_define___extensions__ = yes && diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index fd170d2..1d3e5fe 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ -# fchdir.m4 serial 4 -dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. +# fchdir.m4 serial 6 +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FCHDIR], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([fchdir]) if test $ac_cv_func_fchdir = no; then REPLACE_FCHDIR=1 @@ -14,12 +15,10 @@ AC_DEFUN([gl_FUNC_FCHDIR], gl_PREREQ_FCHDIR AC_DEFINE([FCHDIR_REPLACEMENT], 1, [Define if gnulib's fchdir() replacement is used.]) - gl_CHECK_NEXT_HEADERS([dirent.h]) - DIRENT_H='dirent.h' - else - DIRENT_H= + gl_REPLACE_OPEN + gl_REPLACE_CLOSE + gl_REPLACE_DIRENT_H fi - AC_SUBST([DIRENT_H]) ]) # Prerequisites of lib/fchdir.c. diff --git a/m4/fclose.m4 b/m4/fclose.m4 new file mode 100644 index 0000000..d10c104 --- /dev/null +++ b/m4/fclose.m4 @@ -0,0 +1,18 @@ +# fclose.m4 serial 1 +dnl Copyright (C) 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_FCLOSE], +[ +]) + +AC_DEFUN([gl_REPLACE_FCLOSE], +[ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + if test $REPLACE_FCLOSE != 1; then + AC_LIBOBJ([fclose]) + fi + REPLACE_FCLOSE=1 +]) diff --git a/m4/fpending.m4 b/m4/fpending.m4 index a771b43..65d2ddd 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ -#serial 12 +#serial 13 -# Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007 Free Software +# Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007, 2008 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -53,6 +53,9 @@ AC_DEFUN([gl_FUNC_FPENDING], '# old glibc iostream?' \ 'fp->_pptr - fp->_pbase' \ \ + '# emx+gcc' \ + 'fp->_ptr - fp->_buffer' \ + \ '# VMS' \ '(*fp)->_ptr - (*fp)->_base' \ \ diff --git a/m4/getdate.m4 b/m4/getdate.m4 index d160329..c335243 100644 --- a/m4/getdate.m4 +++ b/m4/getdate.m4 @@ -1,13 +1,19 @@ -# getdate.m4 serial 12 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# getdate.m4 serial 13 +dnl Copyright (C) 2002-2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free 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 Define HAVE_COMPOUND_LITERALS if the C compiler supports compound literals +dnl as in ISO C99. +dnl Note that compound literals such as (struct s) { 3, 4 } can be used for +dnl initialization of stack-allocated variables, but are not constant +dnl expressions and therefore cannot be used as initializer for global or +dnl static variables (even though gcc supports this in pre-C99 mode). AC_DEFUN([gl_C_COMPOUND_LITERALS], [ AC_CACHE_CHECK([for compound literals], gl_cv_compound_literals, - [AC_TRY_COMPILE([struct s { int i, j; }; struct s s = (struct s) { 1, 2 };], + [AC_TRY_COMPILE([struct s { int i, j; };], [struct s t = (struct s) { 3, 4 }; if (t.i != 0) return 0;], gl_cv_compound_literals=yes, diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 index 18b96be..7760f82 100644 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -31,4 +31,5 @@ AC_DEFUN([gl_FUNC_GETDELIM], AC_DEFUN([gl_PREREQ_GETDELIM], [ AC_CHECK_FUNCS([flockfile funlockfile]) + AC_CHECK_DECLS([getc_unlocked]) ]) diff --git a/m4/getopt.m4 b/m4/getopt.m4 index c0a73b2..9b683c2 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 13 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# getopt.m4 serial 14 +dnl Copyright (C) 2002-2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -46,7 +46,7 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], if test -z "$GETOPT_H"; then AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt], [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([#include ], + [AC_LANG_PROGRAM([[#include ]], [[ char *myargv[3]; myargv[0] = "conftest"; diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 9336d72..c73db14 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,9 +1,38 @@ -# gnulib-common.m4 serial 3 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# gnulib-common.m4 serial 6 +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. +# gl_COMMON +# is expanded unconditionally through gnulib-tool magic. +AC_DEFUN([gl_COMMON], [ + dnl Use AC_REQUIRE here, so that the code is expanded once only. + AC_REQUIRE([gl_COMMON_BODY]) +]) +AC_DEFUN([gl_COMMON_BODY], [ + AH_VERBATIM([isoc99_inline], +[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports + the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of + earlier versions), but does not display it by setting __GNUC_STDC_INLINE__. + __APPLE__ && __MACH__ test for MacOS X. + __APPLE_CC__ tests for the Apple compiler and its version. + __STDC_VERSION__ tests for the C99 mode. */ +#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__ +# define __GNUC_STDC_INLINE__ 1 +#endif]) + AH_VERBATIM([unused_parameter], +[/* Define as a marker that can be attached to function parameter declarations + for parameters that are not used. This helps to reduce warnings, such as + from GCC -Wunused-parameter. */ +#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _UNUSED_PARAMETER_ __attribute__ ((__unused__)) +#else +# define _UNUSED_PARAMETER_ +#endif +]) +]) + # gl_MODULE_INDICATOR([modulename]) # defines a C macro indicating the presence of the given module. AC_DEFUN([gl_MODULE_INDICATOR], @@ -12,6 +41,13 @@ AC_DEFUN([gl_MODULE_INDICATOR], [Define to 1 when using the gnulib module ]$1[.]) ]) +# m4_foreach_w +# is a backport of autoconf-2.59c's m4_foreach_w. +# Remove this macro when we can assume autoconf >= 2.60. +m4_ifndef([m4_foreach_w], + [m4_define([m4_foreach_w], + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) + # AC_PROG_MKDIR_P # is a backport of autoconf-2.60's AC_PROG_MKDIR_P. # Remove this macro when we can assume autoconf >= 2.60. diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 1323a0b..6bcd83c 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -49,8 +49,10 @@ AC_DEFUN([gl_INIT], m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS])) m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) + m4_pushdef([gl_LIBSOURCES_LIST], []) + m4_pushdef([gl_LIBSOURCES_DIR], []) + gl_COMMON gl_source_base='.#bootmp/lib' - gl_EOVERFLOW gl_FUNC_ALLOCA gl_ARGMATCH gl_ARGP @@ -59,21 +61,27 @@ AC_DEFUN([gl_INIT], AM_XGETTEXT_OPTION([--flag=argp_failure:4:c-format])]) gl_BACKUPFILE gl_CANONICALIZE_LGPL + gl_MODULE_INDICATOR([canonicalize-lgpl]) gl_FUNC_CHDIR_LONG gl_FUNC_CHOWN gl_UNISTD_MODULE_INDICATOR([chown]) gl_CLOCK_TIME + gl_FUNC_CLOSE + gl_UNISTD_MODULE_INDICATOR([close]) gl_CLOSE_STREAM gl_MODULE_INDICATOR([close-stream]) gl_CLOSEOUT gl_CHECK_TYPE_STRUCT_DIRENT_D_INO + gl_DIRENT_H gl_FUNC_DIRFD + gl_DIRENT_MODULE_INDICATOR([dirfd]) gl_DIRNAME gl_DOUBLE_SLASH_ROOT gl_FUNC_DUP2 gl_UNISTD_MODULE_INDICATOR([dup2]) gl_ENVIRON gl_UNISTD_MODULE_INDICATOR([environ]) + gl_HEADER_ERRNO_H gl_ERROR m4_ifdef([AM_XGETTEXT_OPTION], [AM_XGETTEXT_OPTION([--flag=error:3:c-format]) @@ -82,6 +90,8 @@ AC_DEFUN([gl_INIT], gl_EXITFAIL gl_FUNC_FCHDIR gl_UNISTD_MODULE_INDICATOR([fchdir]) + gl_FUNC_FCLOSE + gl_STDIO_MODULE_INDICATOR([fclose]) gl_FCNTL_H gl_FCNTL_SAFER gl_MODULE_INDICATOR([fcntl-safer]) @@ -123,6 +133,7 @@ AC_DEFUN([gl_INIT], gl_FUNC_LSEEK gl_UNISTD_MODULE_INDICATOR([lseek]) gl_FUNC_LSTAT + gl_SYS_STAT_MODULE_INDICATOR([lstat]) AC_FUNC_MALLOC AC_DEFINE([GNULIB_MALLOC_GNU], 1, [Define to indicate the 'malloc' module.]) gl_FUNC_MALLOC_POSIX @@ -144,10 +155,15 @@ AC_DEFUN([gl_INIT], gl_MODECHANGE AC_FUNC_OBSTACK dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]). + gl_FUNC_OPEN + gl_MODULE_INDICATOR([open]) + gl_FCNTL_MODULE_INDICATOR([open]) gl_FUNC_OPENAT gl_PATHMAX gl_QUOTE gl_QUOTEARG + gl_FUNC_RAWMEMCHR + gl_STRING_MODULE_INDICATOR([rawmemchr]) gl_FUNC_READLINK gl_UNISTD_MODULE_INDICATOR([readlink]) gl_FUNC_REALLOC_POSIX @@ -155,6 +171,7 @@ AC_DEFUN([gl_INIT], gl_REGEX gl_FUNC_RMDIR gl_FUNC_RPMATCH + gl_STDLIB_MODULE_INDICATOR([rpmatch]) gl_SAFE_READ gl_SAFE_WRITE gl_SAVE_CWD @@ -192,8 +209,10 @@ AC_DEFUN([gl_INIT], gl_INTTYPES_MODULE_INDICATOR([strtoimax]) gl_FUNC_STRTOL gl_FUNC_STRTOLL + gl_STDLIB_MODULE_INDICATOR([strtoll]) gl_FUNC_STRTOUL gl_FUNC_STRTOULL + gl_STDLIB_MODULE_INDICATOR([strtoull]) gl_FUNC_STRTOUMAX gl_INTTYPES_MODULE_INDICATOR([strtoumax]) gl_HEADER_SYS_STAT_H @@ -220,11 +239,26 @@ AC_DEFUN([gl_INIT], gl_WCTYPE_H gl_FUNC_WCWIDTH gl_WCHAR_MODULE_INDICATOR([wcwidth]) + gl_FUNC_WRITE + gl_UNISTD_MODULE_INDICATOR([write]) gl_XALLOC gl_XGETCWD gl_XSIZE gl_XSTRNDUP gl_XSTRTOL + m4_ifval(gl_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || + for gl_file in ]gl_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gl_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gl_LIBSOURCES_DIR]) + m4_popdef([gl_LIBSOURCES_LIST]) m4_popdef([AC_LIBSOURCES]) m4_popdef([AC_REPLACE_FUNCS]) m4_popdef([AC_LIBOBJ]) @@ -247,7 +281,23 @@ AC_DEFUN([gl_INIT], m4_pushdef([AC_LIBOBJ], m4_defn([gltests_LIBOBJ])) m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gltests_REPLACE_FUNCS])) m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) + m4_pushdef([gltests_LIBSOURCES_LIST], []) + m4_pushdef([gltests_LIBSOURCES_DIR], []) + gl_COMMON gl_source_base='.#bootmp/tests' + m4_ifval(gltests_LIBSOURCES_LIST, [ + m4_syscmd([test ! -d ]m4_defn([gltests_LIBSOURCES_DIR])[ || + for gl_file in ]gltests_LIBSOURCES_LIST[ ; do + if test ! -r ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file ; then + echo "missing file ]m4_defn([gltests_LIBSOURCES_DIR])[/$gl_file" >&2 + exit 1 + fi + done])dnl + m4_if(m4_sysval, [0], [], + [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) + ]) + m4_popdef([gltests_LIBSOURCES_DIR]) + m4_popdef([gltests_LIBSOURCES_LIST]) m4_popdef([AC_LIBSOURCES]) m4_popdef([AC_REPLACE_FUNCS]) m4_popdef([AC_LIBOBJ]) @@ -278,13 +328,6 @@ AC_DEFUN([gl_LIBOBJ], [ gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" ]) -# m4_foreach_w is provided by autoconf-2.59c and later. -# This definition is to accommodate developers using versions -# of autoconf older than that. -m4_ifndef([m4_foreach_w], - [m4_define([m4_foreach_w], - [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) - # Like AC_REPLACE_FUNCS, except that the module name goes # into gl_LIBOBJS instead of into LIBOBJS. AC_DEFUN([gl_REPLACE_FUNCS], [ @@ -293,15 +336,14 @@ AC_DEFUN([gl_REPLACE_FUNCS], [ ]) # Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parametrization, +# expected is derived from the gnulib-tool parameterization, # and alloca is special cased (for the alloca-opt module). # We could also entirely rely on EXTRA_lib..._SOURCES. AC_DEFUN([gl_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_syscmd([test -r .#bootmp/lib/]_gl_NAME[ || test ! -d .#bootmp/lib])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([missing .#bootmp/lib/]_gl_NAME)]) + m4_define([gl_LIBSOURCES_DIR], [.#bootmp/lib]) + m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) ]) @@ -313,13 +355,6 @@ AC_DEFUN([gltests_LIBOBJ], [ gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" ]) -# m4_foreach_w is provided by autoconf-2.59c and later. -# This definition is to accommodate developers using versions -# of autoconf older than that. -m4_ifndef([m4_foreach_w], - [m4_define([m4_foreach_w], - [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) - # Like AC_REPLACE_FUNCS, except that the module name goes # into gltests_LIBOBJS instead of into LIBOBJS. AC_DEFUN([gltests_REPLACE_FUNCS], [ @@ -328,15 +363,14 @@ AC_DEFUN([gltests_REPLACE_FUNCS], [ ]) # Like AC_LIBSOURCES, except the directory where the source file is -# expected is derived from the gnulib-tool parametrization, +# expected is derived from the gnulib-tool parameterization, # and alloca is special cased (for the alloca-opt module). # We could also entirely rely on EXTRA_lib..._SOURCES. AC_DEFUN([gltests_LIBSOURCES], [ m4_foreach([_gl_NAME], [$1], [ m4_if(_gl_NAME, [alloca.c], [], [ - m4_syscmd([test -r .#bootmp/tests/]_gl_NAME[ || test ! -d .#bootmp/tests])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([missing .#bootmp/tests/]_gl_NAME)]) + m4_define([gltests_LIBSOURCES_DIR], [.#bootmp/tests]) + m4_append([gltests_LIBSOURCES_LIST], _gl_NAME, [ ]) ]) ]) ]) @@ -369,6 +403,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/backupfile.c lib/backupfile.h lib/basename.c + lib/c-ctype.c + lib/c-ctype.h lib/canonicalize-lgpl.c lib/canonicalize.h lib/chdir-long.c @@ -376,17 +412,18 @@ AC_DEFUN([gl_FILE_LIST], [ lib/chown.c lib/close-stream.c lib/close-stream.h + lib/close.c lib/closeout.c lib/closeout.h lib/config.charset lib/creat-safer.c lib/dirent.in.h lib/dirfd.c - lib/dirfd.h lib/dirname.c lib/dirname.h lib/dup-safer.c lib/dup2.c + lib/errno.in.h lib/error.c lib/error.h lib/exclude.c @@ -397,6 +434,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/fchmodat.c lib/fchown-stub.c lib/fchownat.c + lib/fclose.c lib/fcntl--.h lib/fcntl-safer.h lib/fcntl.in.h @@ -441,7 +479,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/localcharset.h lib/lseek.c lib/lstat.c - lib/lstat.h lib/malloc.c lib/malloca.c lib/malloca.h @@ -463,6 +500,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/obstack.h lib/offtostr.c lib/open-safer.c + lib/open.c lib/openat-die.c lib/openat-priv.h lib/openat-proc.c @@ -478,6 +516,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/quote.h lib/quotearg.c lib/quotearg.h + lib/rawmemchr.c + lib/rawmemchr.valgrind lib/readlink.c lib/realloc.c lib/ref-add.sin @@ -507,11 +547,14 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stdarg.in.h lib/stdbool.in.h lib/stdint.in.h + lib/stdio-impl.h + lib/stdio-write.c lib/stdio.in.h lib/stdlib.in.h lib/stpcpy.c lib/strcasecmp.c lib/strchrnul.c + lib/strchrnul.valgrind lib/strdup.c lib/streq.h lib/strerror.c @@ -563,6 +606,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/wchar.in.h lib/wctype.in.h lib/wcwidth.c + lib/write.c lib/xalloc-die.c lib/xalloc.h lib/xgetcwd.c @@ -586,9 +630,11 @@ AC_DEFUN([gl_FILE_LIST], [ m4/chown.m4 m4/clock_time.m4 m4/close-stream.m4 + m4/close.m4 m4/closeout.m4 m4/codeset.m4 m4/d-ino.m4 + m4/dirent_h.m4 m4/dirfd.m4 m4/dirname.m4 m4/dos.m4 @@ -596,12 +642,13 @@ AC_DEFUN([gl_FILE_LIST], [ m4/dup2.m4 m4/eealloc.m4 m4/environ.m4 - m4/eoverflow.m4 + m4/errno_h.m4 m4/error.m4 m4/exclude.m4 m4/exitfail.m4 m4/extensions.m4 m4/fchdir.m4 + m4/fclose.m4 m4/fcntl-safer.m4 m4/fcntl_h.m4 m4/fileblocks.m4 @@ -664,13 +711,16 @@ AC_DEFUN([gl_FILE_LIST], [ m4/mktime.m4 m4/modechange.m4 m4/nls.m4 + m4/open.m4 m4/openat.m4 m4/pathmax.m4 m4/po.m4 m4/printf-posix.m4 + m4/printf.m4 m4/progtest.m4 m4/quote.m4 m4/quotearg.m4 + m4/rawmemchr.m4 m4/readlink.m4 m4/realloc.m4 m4/regex.m4 @@ -711,6 +761,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/sys_time_h.m4 m4/sysexits.m4 m4/tempname.m4 + m4/threadlib.m4 m4/time_h.m4 m4/time_r.m4 m4/timespec.m4 @@ -733,6 +784,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/wctype.m4 m4/wcwidth.m4 m4/wint_t.m4 + m4/write.m4 m4/xalloc.m4 m4/xgetcwd.m4 m4/xsize.m4 diff --git a/m4/include_next.m4 b/m4/include_next.m4 index 7c08e93..b6e4d3a 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,4 +1,4 @@ -# include_next.m4 serial 5 +# include_next.m4 serial 8 dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,6 +6,21 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Paul Eggert and Derek Price. +dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER. +dnl +dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to +dnl 'include' otherwise. +dnl +dnl PRAGMA_SYSTEM_HEADER can be used in files that contain #include_next, +dnl so as to avoid GCC warnings when the gcc option -pedantic is used. +dnl '#pragma GCC system_header' has the same effect as if the file was found +dnl through the include search path specified with '-isystem' options (as +dnl opposed to the search path specified with '-I' options). Namely, gcc +dnl does not warn about some things, and on some systems (Solaris and Interix) +dnl __STDC__ evaluates to 0 instead of to 1. The latter is an undesired side +dnl effect; we are therefore careful to use 'defined __STDC__' or '1' instead +dnl of plain '__STDC__'. + AC_DEFUN([gl_INCLUDE_NEXT], [ AC_LANG_PREPROC_REQUIRE() @@ -13,8 +28,12 @@ AC_DEFUN([gl_INCLUDE_NEXT], [gl_cv_have_include_next], [rm -rf conftestd1 conftestd2 mkdir conftestd1 conftestd2 + dnl The include of is because IBM C 9.0 on AIX 6.1 supports + dnl include_next when used as first preprocessor directive in a file, + dnl but not when preceded by another include directive. cat < conftestd1/conftest.h #define DEFINED_IN_CONFTESTD1 +#include #include_next #ifdef DEFINED_IN_CONFTESTD2 int foo; @@ -36,18 +55,17 @@ EOF CPPFLAGS="$save_CPPFLAGS" rm -rf conftestd1 conftestd2 ]) + PRAGMA_SYSTEM_HEADER= if test $gl_cv_have_include_next = yes; then - - dnl FIXME: Remove HAVE_INCLUDE_NEXT and update everything that uses it - dnl to use @INCLUDE_NEXT@ instead. - AC_DEFINE([HAVE_INCLUDE_NEXT], 1, - [Define if your compiler supports the #include_next directive.]) - INCLUDE_NEXT=include_next + if test -n "$GCC"; then + PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' + fi else INCLUDE_NEXT=include fi AC_SUBST([INCLUDE_NEXT]) + AC_SUBST([PRAGMA_SYSTEM_HEADER]) ]) # gl_CHECK_NEXT_HEADERS(HEADER1 HEADER2 ...) @@ -71,7 +89,7 @@ AC_DEFUN([gl_CHECK_NEXT_HEADERS], AC_REQUIRE([gl_INCLUDE_NEXT]) AC_CHECK_HEADERS_ONCE([$1]) - AC_FOREACH([gl_HEADER_NAME], [$1], + m4_foreach_w([gl_HEADER_NAME], [$1], [AS_VAR_PUSHDEF([gl_next_header], [gl_cv_next_]m4_quote(m4_defn([gl_HEADER_NAME]))) if test $gl_cv_have_include_next = yes; then diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index b17cbda..d84cead 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ -# inttypes.m4 serial 11 -dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. +# inttypes.m4 serial 12 +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,7 +32,7 @@ AC_DEFUN([gl_INTTYPES_H], && test "$ac_cv_have_decl_strtoimax" = yes \ && test "$ac_cv_have_decl_strtoumax" = yes; then AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([ + AC_LANG_PROGRAM([[ #include #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */ @@ -131,7 +131,7 @@ const char *l = /* implicit string concatenation */ SCNoPTR SCNuPTR SCNxPTR #endif ; - ])], + ]])], [gl_cv_header_working_inttypes_h=yes]) fi]) @@ -174,9 +174,9 @@ const char *l = /* implicit string concatenation */ I64) gltype1='__int64';; esac AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include + [AC_LANG_PROGRAM([[#include extern intptr_t foo; - extern $gltype1 foo;])], + extern $gltype1 foo;]])], [PRIPTR_PREFIX='"'$glpfx'"']) test -n "$PRIPTR_PREFIX" && break done diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 1602895..7e07a42 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 15 (gettext-0.18) +# lib-link.m4 serial 16 (gettext-0.18) dnl Copyright (C) 2001-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -194,6 +194,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -352,7 +356,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -443,6 +449,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LIB[]NAME[]_PREFIX="$basedir" additional_includedir="$basedir/include" ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + LIB[]NAME[]_PREFIX="$basedir" + additional_includedir="$basedir/include" + ;; esac if test "X$additional_includedir" != "X"; then dnl Potentially add $additional_includedir to $INCNAME. @@ -501,9 +512,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -684,7 +697,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], if test -n "$next"; then dir="$next" dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -693,7 +707,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -L) next=yes ;; -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index a8684e1..3bdc0fc 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,69 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index b9777a6..9ac109f 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -#serial 16 +#serial 17 -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -11,7 +11,13 @@ dnl From Jim Meyering. AC_DEFUN([gl_FUNC_LSTAT], [ + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ(lstat). + if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then + REPLACE_LSTAT=1 + fi + # Prerequisites of lib/lstat.c. + AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index df2a275..0da32b6 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ -# mbstate_t.m4 serial 9 -dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +# mbstate_t.m4 serial 10 +dnl Copyright (C) 2000-2002, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,9 +16,9 @@ AC_DEFUN([AC_TYPE_MBSTATE_T], [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT -# include ], - [mbstate_t x; return sizeof x;])], + [AC_INCLUDES_DEFAULT[ +# include ]], + [[mbstate_t x; return sizeof x;]])], [ac_cv_type_mbstate_t=yes], [ac_cv_type_mbstate_t=no])]) if test $ac_cv_type_mbstate_t = yes; then diff --git a/m4/open.m4 b/m4/open.m4 new file mode 100644 index 0000000..38dfa26 --- /dev/null +++ b/m4/open.m4 @@ -0,0 +1,66 @@ +# open.m4 serial 4 +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_OPEN], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in + mingw* | pw*) + gl_REPLACE_OPEN + ;; + *) + dnl open("foo/") should not create a file when the file name has a + dnl trailing slash. + AC_CACHE_CHECK([whether open recognizes a trailing slash], + [gl_cv_func_open_slash], + [ + AC_TRY_RUN([ +#include +#if HAVE_UNISTD_H +# include +#endif +int main () +{ + return open ("conftest.sl/", O_CREAT, 0600) >= 0; +}], [gl_cv_func_open_slash=yes], [gl_cv_func_open_slash=no], + [ +changequote(,)dnl + case "$host_os" in + solaris2.[0-9]*) gl_cv_func_open_slash="guessing no" ;; + hpux*) gl_cv_func_open_slash="guessing no" ;; + *) gl_cv_func_open_slash="guessing yes" ;; + esac +changequote([,])dnl + ]) + rm -f conftest.sl + ]) + case "$gl_cv_func_open_slash" in + *no) + AC_DEFINE([OPEN_TRAILING_SLASH_BUG], 1, + [Define to 1 if open() fails to recognize a trailing slash.]) + gl_REPLACE_OPEN + ;; + esac + ;; + esac +]) + +AC_DEFUN([gl_REPLACE_OPEN], +[ + AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) + if test $REPLACE_OPEN != 1; then + AC_LIBOBJ([open]) + gl_PREREQ_OPEN + fi + REPLACE_OPEN=1 +]) + +# Prerequisites of lib/open.c. +AC_DEFUN([gl_PREREQ_OPEN], +[ + AC_REQUIRE([AC_C_INLINE]) + : +]) diff --git a/m4/openat.m4 b/m4/openat.m4 index 43f46d0..3b5b7ca 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ -#serial 15 +#serial 16 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,6 +15,7 @@ AC_DEFUN([gl_FUNC_OPENAT], AC_CHECK_FUNCS_ONCE([lchmod]) AC_CHECK_FUNCS_ONCE([fdopendir]) AC_REPLACE_FUNCS([fchmodat mkdirat openat]) + AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) case $ac_cv_func_openat+$ac_cv_func_lstat_dereferences_slashed_symlink in yes+yes) ;; yes+*) AC_LIBOBJ([fstatat]);; @@ -53,7 +54,7 @@ main () AT_SYMLINK_NOFOLLOW) != 0 && errno == ENOENT); } - ]])], + ]])], [gl_cv_func_fchownat_nofollow_works=yes], [gl_cv_func_fchownat_nofollow_works=no], [gl_cv_func_fchownat_nofollow_works=no], diff --git a/m4/printf.m4 b/m4/printf.m4 new file mode 100644 index 0000000..d544edd --- /dev/null +++ b/m4/printf.m4 @@ -0,0 +1,1309 @@ +# printf.m4 serial 23 +dnl Copyright (C) 2003, 2007-2008 Free Software Foundation, Inc. +dnl This file is free software; the Free 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 Test whether the *printf family of functions supports the 'j', 'z', 't', +dnl 'L' size specifiers. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_printf_sizes_c99. + +AC_DEFUN([gl_PRINTF_SIZES_C99], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gl_AC_HEADER_STDINT_H]) + AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports size specifiers as in C99], + [gl_cv_func_printf_sizes_c99], + [ + AC_TRY_RUN([ +#include +#include +#include +#include +#if HAVE_STDINT_H_WITH_UINTMAX +# include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +# include +#endif +static char buf[100]; +int main () +{ +#if HAVE_STDINT_H_WITH_UINTMAX || HAVE_INTTYPES_H_WITH_UINTMAX + buf[0] = '\0'; + if (sprintf (buf, "%ju %d", (uintmax_t) 12345671, 33, 44, 55) < 0 + || strcmp (buf, "12345671 33") != 0) + return 1; +#endif + buf[0] = '\0'; + if (sprintf (buf, "%zu %d", (size_t) 12345672, 33, 44, 55) < 0 + || strcmp (buf, "12345672 33") != 0) + return 1; + buf[0] = '\0'; + if (sprintf (buf, "%tu %d", (ptrdiff_t) 12345673, 33, 44, 55) < 0 + || strcmp (buf, "12345673 33") != 0) + return 1; + buf[0] = '\0'; + if (sprintf (buf, "%Lg %d", (long double) 1.5, 33, 44, 55) < 0 + || strcmp (buf, "1.5 33") != 0) + return 1; + return 0; +}], [gl_cv_func_printf_sizes_c99=yes], [gl_cv_func_printf_sizes_c99=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4]*) gl_cv_func_printf_sizes_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_printf_sizes_c99="guessing no";; + darwin*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on OpenBSD >= 3.9. + openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) + gl_cv_func_printf_sizes_c99="guessing no";; + openbsd*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on Solaris >= 2.10. + solaris2.[0-9]*) gl_cv_func_printf_sizes_c99="guessing no";; + solaris*) gl_cv_func_printf_sizes_c99="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_printf_sizes_c99="guessing no";; + netbsd*) gl_cv_func_printf_sizes_c99="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_sizes_c99="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports 'long double' +dnl arguments together with the 'L' size specifier. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_printf_long_double. + +AC_DEFUN([gl_PRINTF_LONG_DOUBLE], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports 'long double' arguments], + [gl_cv_func_printf_long_double], + [ + AC_TRY_RUN([ +#include +#include +static char buf[10000]; +int main () +{ + buf[0] = '\0'; + if (sprintf (buf, "%Lf %d", 1.75L, 33, 44, 55) < 0 + || strcmp (buf, "1.750000 33") != 0) + return 1; + buf[0] = '\0'; + if (sprintf (buf, "%Le %d", 1.75L, 33, 44, 55) < 0 + || strcmp (buf, "1.750000e+00 33") != 0) + return 1; + buf[0] = '\0'; + if (sprintf (buf, "%Lg %d", 1.75L, 33, 44, 55) < 0 + || strcmp (buf, "1.75 33") != 0) + return 1; + return 0; +}], [gl_cv_func_printf_long_double=yes], [gl_cv_func_printf_long_double=no], + [ +changequote(,)dnl + case "$host_os" in + beos*) gl_cv_func_printf_long_double="guessing no";; + mingw* | pw*) gl_cv_func_printf_long_double="guessing no";; + *) gl_cv_func_printf_long_double="guessing yes";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports infinite and NaN +dnl 'double' arguments in the %f, %e, %g directives. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_printf_infinite. + +AC_DEFUN([gl_PRINTF_INFINITE], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports infinite 'double' arguments], + [gl_cv_func_printf_infinite], + [ + AC_TRY_RUN([ +#include +#include +static int +strisnan (const char *string, size_t start_index, size_t end_index) +{ + if (start_index < end_index) + { + if (string[start_index] == '-') + start_index++; + if (start_index + 3 <= end_index + && memcmp (string + start_index, "nan", 3) == 0) + { + start_index += 3; + if (start_index == end_index + || (string[start_index] == '(' && string[end_index - 1] == ')')) + return 1; + } + } + return 0; +} +static char buf[10000]; +static double zero = 0.0; +int main () +{ + if (sprintf (buf, "%f", 1.0 / 0.0) < 0 + || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) + return 1; + if (sprintf (buf, "%f", -1.0 / 0.0) < 0 + || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) + return 1; + if (sprintf (buf, "%f", zero / zero) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%e", 1.0 / 0.0) < 0 + || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) + return 1; + if (sprintf (buf, "%e", -1.0 / 0.0) < 0 + || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) + return 1; + if (sprintf (buf, "%e", zero / zero) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%g", 1.0 / 0.0) < 0 + || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) + return 1; + if (sprintf (buf, "%g", -1.0 / 0.0) < 0 + || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) + return 1; + if (sprintf (buf, "%g", zero / zero) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + return 0; +}], [gl_cv_func_printf_infinite=yes], [gl_cv_func_printf_infinite=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on FreeBSD >= 6. + freebsd[1-5]*) gl_cv_func_printf_infinite="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_printf_infinite="guessing no";; + darwin*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on HP-UX >= 11. + hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite="guessing no";; + hpux*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_printf_infinite="guessing no";; + netbsd*) gl_cv_func_printf_infinite="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_infinite="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_infinite="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports infinite and NaN +dnl 'long double' arguments in the %f, %e, %g directives. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_printf_infinite_long_double. + +AC_DEFUN([gl_PRINTF_INFINITE_LONG_DOUBLE], +[ + AC_REQUIRE([gl_PRINTF_LONG_DOUBLE]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_C_BIGENDIAN]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + dnl The user can set or unset the variable gl_printf_safe to indicate + dnl that he wishes a safe handling of non-IEEE-754 'long double' values. + if test -n "$gl_printf_safe"; then + AC_DEFINE([CHECK_PRINTF_SAFE], 1, + [Define if you wish *printf() functions that have a safe handling of + non-IEEE-754 'long double' values.]) + fi + case "$gl_cv_func_printf_long_double" in + *yes) + AC_CACHE_CHECK([whether printf supports infinite 'long double' arguments], + [gl_cv_func_printf_infinite_long_double], + [ + AC_TRY_RUN([ +]GL_NOCRASH[ +#include +#include +#include +static int +strisnan (const char *string, size_t start_index, size_t end_index) +{ + if (start_index < end_index) + { + if (string[start_index] == '-') + start_index++; + if (start_index + 3 <= end_index + && memcmp (string + start_index, "nan", 3) == 0) + { + start_index += 3; + if (start_index == end_index + || (string[start_index] == '(' && string[end_index - 1] == ')')) + return 1; + } + } + return 0; +} +static char buf[10000]; +static long double zeroL = 0.0L; +int main () +{ + nocrash_init(); + if (sprintf (buf, "%Lf", 1.0L / 0.0L) < 0 + || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) + return 1; + if (sprintf (buf, "%Lf", -1.0L / 0.0L) < 0 + || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) + return 1; + if (sprintf (buf, "%Lf", zeroL / zeroL) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", 1.0L / 0.0L) < 0 + || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) + return 1; + if (sprintf (buf, "%Le", -1.0L / 0.0L) < 0 + || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) + return 1; + if (sprintf (buf, "%Le", zeroL / zeroL) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", 1.0L / 0.0L) < 0 + || (strcmp (buf, "inf") != 0 && strcmp (buf, "infinity") != 0)) + return 1; + if (sprintf (buf, "%Lg", -1.0L / 0.0L) < 0 + || (strcmp (buf, "-inf") != 0 && strcmp (buf, "-infinity") != 0)) + return 1; + if (sprintf (buf, "%Lg", zeroL / zeroL) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; +#if CHECK_PRINTF_SAFE && ((defined __ia64 && LDBL_MANT_DIG == 64) || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_)) +/* Representation of an 80-bit 'long double' as an initializer for a sequence + of 'unsigned int' words. */ +# ifdef WORDS_BIGENDIAN +# define LDBL80_WORDS(exponent,manthi,mantlo) \ + { ((unsigned int) (exponent) << 16) | ((unsigned int) (manthi) >> 16), \ + ((unsigned int) (manthi) << 16) | (unsigned int) (mantlo) >> 16), \ + (unsigned int) (mantlo) << 16 \ + } +# else +# define LDBL80_WORDS(exponent,manthi,mantlo) \ + { mantlo, manthi, exponent } +# endif + { /* Quiet NaN. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0xFFFF, 0xC3333333, 0x00000000) }; + if (sprintf (buf, "%Lf", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + } + { + /* Signalling NaN. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0xFFFF, 0x83333333, 0x00000000) }; + if (sprintf (buf, "%Lf", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + } + { /* Pseudo-NaN. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0xFFFF, 0x40000001, 0x00000000) }; + if (sprintf (buf, "%Lf", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + } + { /* Pseudo-Infinity. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0xFFFF, 0x00000000, 0x00000000) }; + if (sprintf (buf, "%Lf", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + } + { /* Pseudo-Zero. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0x4004, 0x00000000, 0x00000000) }; + if (sprintf (buf, "%Lf", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + } + { /* Unnormalized number. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0x4000, 0x63333333, 0x00000000) }; + if (sprintf (buf, "%Lf", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + } + { /* Pseudo-Denormal. */ + static union { unsigned int word[4]; long double value; } x = + { LDBL80_WORDS (0x0000, 0x83333333, 0x00000000) }; + if (sprintf (buf, "%Lf", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Le", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + if (sprintf (buf, "%Lg", x.value) < 0 + || !strisnan (buf, 0, strlen (buf))) + return 1; + } +#endif + return 0; +}], + [gl_cv_func_printf_infinite_long_double=yes], + [gl_cv_func_printf_infinite_long_double=no], + [ +changequote(,)dnl + case "$host_cpu" in + # Guess no on ia64, x86_64, i386. + ia64 | x86_64 | i*86) gl_cv_func_printf_infinite_long_double="guessing no";; + *) + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # Guess yes on FreeBSD >= 6. + freebsd[1-5]*) gl_cv_func_printf_infinite_long_double="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_printf_infinite_long_double="guessing no";; + darwin*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # Guess yes on HP-UX >= 11. + hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";; + hpux*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_printf_infinite_long_double="guessing no";; + netbsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_infinite_long_double="guessing no";; + esac + ;; + esac +changequote([,])dnl + ]) + ]) + ;; + *) + gl_cv_func_printf_infinite_long_double="irrelevant" + ;; + esac +]) + +dnl Test whether the *printf family of functions supports the 'a' and 'A' +dnl conversion specifier for hexadecimal output of floating-point numbers. +dnl (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_printf_directive_a. + +AC_DEFUN([gl_PRINTF_DIRECTIVE_A], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the 'a' and 'A' directives], + [gl_cv_func_printf_directive_a], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + if (sprintf (buf, "%a %d", 3.1416015625, 33, 44, 55) < 0 + || (strcmp (buf, "0x1.922p+1 33") != 0 + && strcmp (buf, "0x3.244p+0 33") != 0 + && strcmp (buf, "0x6.488p-1 33") != 0 + && strcmp (buf, "0xc.91p-2 33") != 0)) + return 1; + if (sprintf (buf, "%A %d", -3.1416015625, 33, 44, 55) < 0 + || (strcmp (buf, "-0X1.922P+1 33") != 0 + && strcmp (buf, "-0X3.244P+0 33") != 0 + && strcmp (buf, "-0X6.488P-1 33") != 0 + && strcmp (buf, "-0XC.91P-2 33") != 0)) + return 1; + /* This catches a FreeBSD 6.1 bug: it doesn't round. */ + if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 + || (strcmp (buf, "0x1.83p+0 33") != 0 + && strcmp (buf, "0x3.05p-1 33") != 0 + && strcmp (buf, "0x6.0ap-2 33") != 0 + && strcmp (buf, "0xc.14p-3 33") != 0)) + return 1; + /* This catches a FreeBSD 6.1 bug. See + */ + if (sprintf (buf, "%010a %d", 1.0 / 0.0, 33, 44, 55) < 0 + || buf[0] == '0') + return 1; + /* This catches a MacOS X 10.3.9 (Darwin 7.9) bug. */ + if (sprintf (buf, "%.1a", 1.999) < 0 + || (strcmp (buf, "0x1.0p+1") != 0 + && strcmp (buf, "0x2.0p+0") != 0 + && strcmp (buf, "0x4.0p-1") != 0 + && strcmp (buf, "0x8.0p-2") != 0)) + return 1; + /* This catches the same MacOS X 10.3.9 (Darwin 7.9) bug and also a + glibc 2.4 bug . */ + if (sprintf (buf, "%.1La", 1.999L) < 0 + || (strcmp (buf, "0x1.0p+1") != 0 + && strcmp (buf, "0x2.0p+0") != 0 + && strcmp (buf, "0x4.0p-1") != 0 + && strcmp (buf, "0x8.0p-2") != 0)) + return 1; + return 0; +}], [gl_cv_func_printf_directive_a=yes], [gl_cv_func_printf_directive_a=no], + [ + case "$host_os" in + # Guess yes on glibc >= 2.5 systems. + *-gnu*) + AC_EGREP_CPP([BZ2908], [ + #include + #ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 5) || (__GLIBC__ > 2) + BZ2908 + #endif + #endif + ], + [gl_cv_func_printf_directive_a="guessing yes"], + [gl_cv_func_printf_directive_a="guessing no"]) + ;; + # If we don't know, assume the worst. + *) gl_cv_func_printf_directive_a="guessing no";; + esac + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports the %F format +dnl directive. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_printf_directive_f. + +AC_DEFUN([gl_PRINTF_DIRECTIVE_F], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the 'F' directive], + [gl_cv_func_printf_directive_f], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + if (sprintf (buf, "%F %d", 1234567.0, 33, 44, 55) < 0 + || strcmp (buf, "1234567.000000 33") != 0) + return 1; + if (sprintf (buf, "%F", 1.0 / 0.0) < 0 + || (strcmp (buf, "INF") != 0 && strcmp (buf, "INFINITY") != 0)) + return 1; + /* This catches a Cygwin 2007 bug. */ + if (sprintf (buf, "%.F", 1234.0) < 0 + || strcmp (buf, "1234") != 0) + return 1; + return 0; +}], [gl_cv_func_printf_directive_f=yes], [gl_cv_func_printf_directive_f=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_directive_f="guessing yes";; + # Guess yes on FreeBSD >= 6. + freebsd[1-5]*) gl_cv_func_printf_directive_f="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_printf_directive_f="guessing no";; + darwin*) gl_cv_func_printf_directive_f="guessing yes";; + # Guess yes on Solaris >= 2.10. + solaris2.[0-9]*) gl_cv_func_printf_directive_f="guessing no";; + solaris*) gl_cv_func_printf_directive_f="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_directive_f="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports the %n format +dnl directive. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_printf_directive_n. + +AC_DEFUN([gl_PRINTF_DIRECTIVE_N], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the 'n' directive], + [gl_cv_func_printf_directive_n], + [ + AC_TRY_RUN([ +#include +#include +static char fmtstring[10]; +static char buf[100]; +int main () +{ + int count = -1; + /* Copy the format string. Some systems (glibc with _FORTIFY_SOURCE=2) + support %n in format strings in read-only memory but not in writable + memory. */ + strcpy (fmtstring, "%d %n"); + if (sprintf (buf, fmtstring, 123, &count, 33, 44, 55) < 0 + || strcmp (buf, "123 ") != 0 + || count != 4) + return 1; + return 0; +}], [gl_cv_func_printf_directive_n=yes], [gl_cv_func_printf_directive_n=no], + [ +changequote(,)dnl + case "$host_os" in + *) gl_cv_func_printf_directive_n="guessing yes";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports POSIX/XSI format +dnl strings with positions. (POSIX:2001) +dnl Result is gl_cv_func_printf_positions. + +AC_DEFUN([gl_PRINTF_POSITIONS], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports POSIX/XSI format strings with positions], + [gl_cv_func_printf_positions], + [ + AC_TRY_RUN([ +#include +#include +/* The string "%2$d %1$d", with dollar characters protected from the shell's + dollar expansion (possibly an autoconf bug). */ +static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; +static char buf[100]; +int main () +{ + sprintf (buf, format, 33, 55); + return (strcmp (buf, "55 33") != 0); +}], [gl_cv_func_printf_positions=yes], [gl_cv_func_printf_positions=no], + [ +changequote(,)dnl + case "$host_os" in + netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*) + gl_cv_func_printf_positions="guessing no";; + beos*) gl_cv_func_printf_positions="guessing no";; + mingw* | pw*) gl_cv_func_printf_positions="guessing no";; + *) gl_cv_func_printf_positions="guessing yes";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports POSIX/XSI format +dnl strings with the ' flag for grouping of decimal digits. (POSIX:2001) +dnl Result is gl_cv_func_printf_flag_grouping. + +AC_DEFUN([gl_PRINTF_FLAG_GROUPING], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the grouping flag], + [gl_cv_func_printf_flag_grouping], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + if (sprintf (buf, "%'d %d", 1234567, 99) < 0 + || buf[strlen (buf) - 1] != '9') + return 1; + return 0; +}], [gl_cv_func_printf_flag_grouping=yes], [gl_cv_func_printf_flag_grouping=no], + [ +changequote(,)dnl + case "$host_os" in + cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; + netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; + mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; + *) gl_cv_func_printf_flag_grouping="guessing yes";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports the - flag correctly. +dnl (ISO C99.) See +dnl +dnl Result is gl_cv_func_printf_flag_leftadjust. + +AC_DEFUN([gl_PRINTF_FLAG_LEFTADJUST], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the left-adjust flag correctly], + [gl_cv_func_printf_flag_leftadjust], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + /* Check that a '-' flag is not annihilated by a negative width. */ + if (sprintf (buf, "a%-*sc", -3, "b") < 0 + || strcmp (buf, "ab c") != 0) + return 1; + return 0; +}], + [gl_cv_func_printf_flag_leftadjust=yes], + [gl_cv_func_printf_flag_leftadjust=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on HP-UX 11. + hpux11*) gl_cv_func_printf_flag_leftadjust="guessing yes";; + # Guess no on HP-UX 10 and older. + hpux*) gl_cv_func_printf_flag_leftadjust="guessing no";; + # Guess yes otherwise. + *) gl_cv_func_printf_flag_leftadjust="guessing yes";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports padding of non-finite +dnl values with the 0 flag correctly. (ISO C99 + TC1 + TC2.) See +dnl +dnl Result is gl_cv_func_printf_flag_zero. + +AC_DEFUN([gl_PRINTF_FLAG_ZERO], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports the zero flag correctly], + [gl_cv_func_printf_flag_zero], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + if (sprintf (buf, "%010f", 1.0 / 0.0, 33, 44, 55) < 0 + || (strcmp (buf, " inf") != 0 + && strcmp (buf, " infinity") != 0)) + return 1; + return 0; +}], [gl_cv_func_printf_flag_zero=yes], [gl_cv_func_printf_flag_zero=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_flag_zero="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_flag_zero="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_flag_zero="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions supports large precisions. +dnl On mingw, precisions larger than 512 are treated like 512, in integer, +dnl floating-point or pointer output. On BeOS, precisions larger than 1044 +dnl crash the program. +dnl Result is gl_cv_func_printf_precision. + +AC_DEFUN([gl_PRINTF_PRECISION], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf supports large precisions], + [gl_cv_func_printf_precision], + [ + AC_TRY_RUN([ +#include +#include +static char buf[5000]; +int main () +{ +#ifdef __BEOS__ + /* On BeOS, this would crash and show a dialog box. Avoid the crash. */ + return 1; +#endif + if (sprintf (buf, "%.4000d %d", 1, 33, 44) < 4000 + 3) + return 1; + return 0; +}], [gl_cv_func_printf_precision=yes], [gl_cv_func_printf_precision=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess no only on native Win32 and BeOS systems. + mingw* | pw*) gl_cv_func_printf_precision="guessing no" ;; + beos*) gl_cv_func_printf_precision="guessing no" ;; + *) gl_cv_func_printf_precision="guessing yes" ;; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the *printf family of functions recovers gracefully in case +dnl of an out-of-memory condition, or whether it crashes the entire program. +dnl Result is gl_cv_func_printf_enomem. + +AC_DEFUN([gl_PRINTF_ENOMEM], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether printf survives out-of-memory conditions], + [gl_cv_func_printf_enomem], + [ + if test "$cross_compiling" = no; then + AC_LANG_CONFTEST([AC_LANG_SOURCE([ +]GL_NOCRASH[ +changequote(,)dnl +#include +#include +#include +#include +#include +int main() +{ + struct rlimit limit; + int ret; + nocrash_init (); + /* Some printf implementations allocate temporary space with malloc. */ + /* On BSD systems, malloc() is limited by RLIMIT_DATA. */ +#ifdef RLIMIT_DATA + if (getrlimit (RLIMIT_DATA, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > 5000000) + limit.rlim_max = 5000000; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_DATA, &limit) < 0) + return 77; +#endif + /* On Linux systems, malloc() is limited by RLIMIT_AS. */ +#ifdef RLIMIT_AS + if (getrlimit (RLIMIT_AS, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > 5000000) + limit.rlim_max = 5000000; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_AS, &limit) < 0) + return 77; +#endif + /* Some printf implementations allocate temporary space on the stack. */ +#ifdef RLIMIT_STACK + if (getrlimit (RLIMIT_STACK, &limit) < 0) + return 77; + if (limit.rlim_max == RLIM_INFINITY || limit.rlim_max > 5000000) + limit.rlim_max = 5000000; + limit.rlim_cur = limit.rlim_max; + if (setrlimit (RLIMIT_STACK, &limit) < 0) + return 77; +#endif + ret = printf ("%.5000000f", 1.0); + return !(ret == 5000002 || (ret < 0 && errno == ENOMEM)); +} +changequote([,])dnl + ])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + (./conftest + result=$? + if test $result != 0 && test $result != 77; then result=1; fi + exit $result + ) >/dev/null 2>/dev/null + case $? in + 0) gl_cv_func_printf_enomem="yes" ;; + 77) gl_cv_func_printf_enomem="guessing no" ;; + *) gl_cv_func_printf_enomem="no" ;; + esac + else + gl_cv_func_printf_enomem="guessing no" + fi + rm -fr conftest* + else +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on Solaris. + solaris*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on AIX. + aix*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on HP-UX/hppa. + hpux*) case "$host_cpu" in + hppa*) gl_cv_func_printf_enomem="guessing yes";; + *) gl_cv_func_printf_enomem="guessing no";; + esac + ;; + # Guess yes on IRIX. + irix*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on OSF/1. + osf*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_printf_enomem="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_printf_enomem="guessing no";; + esac +changequote([,])dnl + fi + ]) +]) + +dnl Test whether the snprintf function exists. (ISO C99, POSIX:2001) +dnl Result is ac_cv_func_snprintf. + +AC_DEFUN([gl_SNPRINTF_PRESENCE], +[ + AC_CHECK_FUNCS_ONCE([snprintf]) +]) + +dnl Test whether the string produced by the snprintf function is always NUL +dnl terminated. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_snprintf_truncation_c99. + +AC_DEFUN([gl_SNPRINTF_TRUNCATION_C99], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether snprintf truncates the result as in C99], + [gl_cv_func_snprintf_truncation_c99], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + strcpy (buf, "ABCDEF"); + snprintf (buf, 3, "%d %d", 4567, 89); + if (memcmp (buf, "45\0DEF", 6) != 0) + return 1; + return 0; +}], [gl_cv_func_snprintf_truncation_c99=yes], [gl_cv_func_snprintf_truncation_c99=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4]*) gl_cv_func_snprintf_truncation_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_truncation_c99="guessing no";; + darwin*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on OpenBSD >= 3.9. + openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) + gl_cv_func_snprintf_truncation_c99="guessing no";; + openbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on Solaris >= 2.6. + solaris2.[0-5]*) gl_cv_func_snprintf_truncation_c99="guessing no";; + solaris*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_snprintf_truncation_c99="guessing no";; + aix*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on HP-UX >= 11. + hpux[7-9]* | hpux10*) gl_cv_func_snprintf_truncation_c99="guessing no";; + hpux*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on IRIX >= 6.5. + irix6.5) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on OSF/1 >= 5. + osf[3-4]*) gl_cv_func_snprintf_truncation_c99="guessing no";; + osf*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_snprintf_truncation_c99="guessing no";; + netbsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_snprintf_truncation_c99="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_snprintf_truncation_c99="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the return value of the snprintf function is the number +dnl of bytes (excluding the terminating NUL) that would have been produced +dnl if the buffer had been large enough. (ISO C99, POSIX:2001) +dnl For example, this test program fails on IRIX 6.5: +dnl --------------------------------------------------------------------- +dnl #include +dnl int main() +dnl { +dnl static char buf[8]; +dnl int retval = snprintf (buf, 3, "%d", 12345); +dnl return retval >= 0 && retval < 3; +dnl } +dnl --------------------------------------------------------------------- +dnl Result is gl_cv_func_snprintf_retval_c99. + +AC_DEFUN([gl_SNPRINTF_RETVAL_C99], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether snprintf returns a byte count as in C99], + [gl_cv_func_snprintf_retval_c99], + [ + AC_TRY_RUN([ +#include +#include +static char buf[100]; +int main () +{ + strcpy (buf, "ABCDEF"); + if (snprintf (buf, 3, "%d %d", 4567, 89) != 7) + return 1; + return 0; +}], [gl_cv_func_snprintf_retval_c99=yes], [gl_cv_func_snprintf_retval_c99=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4]*) gl_cv_func_snprintf_retval_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_retval_c99="guessing no";; + darwin*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on OpenBSD >= 3.9. + openbsd[1-2].* | openbsd3.[0-8] | openbsd3.[0-8].*) + gl_cv_func_snprintf_retval_c99="guessing no";; + openbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on Solaris >= 2.6. + solaris2.[0-5]*) gl_cv_func_snprintf_retval_c99="guessing no";; + solaris*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_snprintf_retval_c99="guessing no";; + aix*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_snprintf_retval_c99="guessing no";; + netbsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_snprintf_retval_c99="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_snprintf_retval_c99="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the snprintf function supports the %n format directive +dnl also in truncated portions of the format string. (ISO C99, POSIX:2001) +dnl Result is gl_cv_func_snprintf_directive_n. + +AC_DEFUN([gl_SNPRINTF_DIRECTIVE_N], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether snprintf fully supports the 'n' directive], + [gl_cv_func_snprintf_directive_n], + [ + AC_TRY_RUN([ +#include +#include +static char fmtstring[10]; +static char buf[100]; +int main () +{ + int count = -1; + /* Copy the format string. Some systems (glibc with _FORTIFY_SOURCE=2) + support %n in format strings in read-only memory but not in writable + memory. */ + strcpy (fmtstring, "%d %n"); + snprintf (buf, 4, fmtstring, 12345, &count, 33, 44, 55); + if (count != 6) + return 1; + return 0; +}], [gl_cv_func_snprintf_directive_n=yes], [gl_cv_func_snprintf_directive_n=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4]*) gl_cv_func_snprintf_directive_n="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_snprintf_directive_n="guessing no";; + darwin*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on Solaris >= 2.6. + solaris2.[0-5]*) gl_cv_func_snprintf_directive_n="guessing no";; + solaris*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_snprintf_directive_n="guessing no";; + aix*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on IRIX >= 6.5. + irix6.5) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on OSF/1 >= 5. + osf[3-4]*) gl_cv_func_snprintf_directive_n="guessing no";; + osf*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_snprintf_directive_n="guessing no";; + netbsd*) gl_cv_func_snprintf_directive_n="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_snprintf_directive_n="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_snprintf_directive_n="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl Test whether the snprintf function, when passed a size = 1, writes any +dnl output without bounds in this case, behaving like sprintf. This is the +dnl case on Linux libc5. +dnl Result is gl_cv_func_snprintf_size1. + +AC_DEFUN([gl_SNPRINTF_SIZE1], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([whether snprintf respects a size of 1], + [gl_cv_func_snprintf_size1], + [ + AC_TRY_RUN([ +#include +int main() +{ + static char buf[8] = "DEADBEEF"; + snprintf (buf, 1, "%d", 12345); + return buf[1] != 'E'; +}], + [gl_cv_func_snprintf_size1=yes], + [gl_cv_func_snprintf_size1=no], + [gl_cv_func_snprintf_size1="guessing yes"]) + ]) +]) + +dnl Test whether the vsnprintf function, when passed a zero size, produces no +dnl output. (ISO C99, POSIX:2001) +dnl For example, snprintf nevertheless writes a NUL byte in this case +dnl on OSF/1 5.1: +dnl --------------------------------------------------------------------- +dnl #include +dnl int main() +dnl { +dnl static char buf[8] = "DEADBEEF"; +dnl snprintf (buf, 0, "%d", 12345); +dnl return buf[0] != 'D'; +dnl } +dnl --------------------------------------------------------------------- +dnl And vsnprintf writes any output without bounds in this case, behaving like +dnl vsprintf, on HP-UX 11 and OSF/1 5.1: +dnl --------------------------------------------------------------------- +dnl #include +dnl #include +dnl static int my_snprintf (char *buf, int size, const char *format, ...) +dnl { +dnl va_list args; +dnl int ret; +dnl va_start (args, format); +dnl ret = vsnprintf (buf, size, format, args); +dnl va_end (args); +dnl return ret; +dnl } +dnl int main() +dnl { +dnl static char buf[8] = "DEADBEEF"; +dnl my_snprintf (buf, 0, "%d", 12345); +dnl return buf[0] != 'D'; +dnl } +dnl --------------------------------------------------------------------- +dnl Result is gl_cv_func_vsnprintf_zerosize_c99. + +AC_DEFUN([gl_VSNPRINTF_ZEROSIZE_C99], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether vsnprintf respects a zero size as in C99], + [gl_cv_func_vsnprintf_zerosize_c99], + [ + AC_TRY_RUN([ +#include +#include +static int my_snprintf (char *buf, int size, const char *format, ...) +{ + va_list args; + int ret; + va_start (args, format); + ret = vsnprintf (buf, size, format, args); + va_end (args); + return ret; +} +int main() +{ + static char buf[8] = "DEADBEEF"; + my_snprintf (buf, 0, "%d", 12345); + return buf[0] != 'D'; +}], + [gl_cv_func_vsnprintf_zerosize_c99=yes], + [gl_cv_func_vsnprintf_zerosize_c99=no], + [ +changequote(,)dnl + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on FreeBSD >= 5. + freebsd[1-4]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on MacOS X >= 10.3. + darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Cygwin. + cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on Solaris >= 2.6. + solaris2.[0-5]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + solaris*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on AIX >= 4. + aix[1-3]*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + aix*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on IRIX >= 6.5. + irix6.5) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on NetBSD >= 3. + netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*) + gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + netbsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on BeOS. + beos*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # Guess yes on mingw. + mingw* | pw*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; + # If we don't know, assume the worst. + *) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; + esac +changequote([,])dnl + ]) + ]) +]) + +dnl The results of these tests on various platforms are: +dnl +dnl 1 = gl_PRINTF_SIZES_C99 +dnl 2 = gl_PRINTF_LONG_DOUBLE +dnl 3 = gl_PRINTF_INFINITE +dnl 4 = gl_PRINTF_INFINITE_LONG_DOUBLE +dnl 5 = gl_PRINTF_DIRECTIVE_A +dnl 6 = gl_PRINTF_DIRECTIVE_F +dnl 7 = gl_PRINTF_DIRECTIVE_N +dnl 8 = gl_PRINTF_POSITIONS +dnl 9 = gl_PRINTF_FLAG_GROUPING +dnl 10 = gl_PRINTF_FLAG_LEFTADJUST +dnl 11 = gl_PRINTF_FLAG_ZERO +dnl 12 = gl_PRINTF_PRECISION +dnl 13 = gl_PRINTF_ENOMEM +dnl 14 = gl_SNPRINTF_PRESENCE +dnl 15 = gl_SNPRINTF_TRUNCATION_C99 +dnl 16 = gl_SNPRINTF_RETVAL_C99 +dnl 17 = gl_SNPRINTF_DIRECTIVE_N +dnl 18 = gl_SNPRINTF_SIZE1 +dnl 19 = gl_VSNPRINTF_ZEROSIZE_C99 +dnl +dnl 1 = checking whether printf supports size specifiers as in C99... +dnl 2 = checking whether printf supports 'long double' arguments... +dnl 3 = checking whether printf supports infinite 'double' arguments... +dnl 4 = checking whether printf supports infinite 'long double' arguments... +dnl 5 = checking whether printf supports the 'a' and 'A' directives... +dnl 6 = checking whether printf supports the 'F' directive... +dnl 7 = checking whether printf supports the 'n' directive... +dnl 8 = checking whether printf supports POSIX/XSI format strings with positions... +dnl 9 = checking whether printf supports the grouping flag... +dnl 10 = checking whether printf supports the left-adjust flag correctly... +dnl 11 = checking whether printf supports the zero flag correctly... +dnl 12 = checking whether printf supports large precisions... +dnl 13 = checking whether printf survives out-of-memory conditions... +dnl 14 = checking for snprintf... +dnl 15 = checking whether snprintf truncates the result as in C99... +dnl 16 = checking whether snprintf returns a byte count as in C99... +dnl 17 = checking whether snprintf fully supports the 'n' directive... +dnl 18 = checking whether snprintf respects a size of 1... +dnl 19 = checking whether vsnprintf respects a zero size as in C99... +dnl +dnl . = yes, # = no. +dnl +dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 +dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . +dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . +dnl FreeBSD 5.4, 6.1 . . . . # . . . . . # . # . . . . . . +dnl MacOS X 10.3.9 . . . . # . . . . . # . # . . . . . . +dnl OpenBSD 3.9, 4.0 . . # # # # . . # . # . # . . . . . . +dnl Cygwin 2007 (= Cygwin 1.5.24) . . . . # # . . . ? # ? ? . . . . . . +dnl Cygwin 2006 (= Cygwin 1.5.19) # . . . # # . . # ? # ? ? . . . . . . +dnl Solaris 10 . . # # # . . . . . # . . . . . . . . +dnl Solaris 2.6 ... 9 # . # # # # . . . . # . . . . . . . . +dnl Solaris 2.5.1 # . # # # # . . . . # . . # # # # # # +dnl AIX 5.2 . . # # # . . . . . # . . . . . . . . +dnl AIX 4.3.2, 5.1 # . # # # # . . . . # . . . . . . . . +dnl HP-UX 11.31 . . . . # . . . . . # . . . . # # . . +dnl HP-UX 11.{00,11,23} # . . . # # . . . . # . . . . # # . # +dnl HP-UX 10.20 # . . . # # . . . # # . . . . # # ? # +dnl IRIX 6.5 # . # # # # . . . . # . . . . # . . . +dnl OSF/1 5.1 # . # # # # . . . . # . . . . # . . # +dnl OSF/1 4.0d # . # # # # . . . . # . . # # # # # # +dnl NetBSD 4.0 . ? ? ? ? ? . . ? ? ? ? ? . . . ? ? ? +dnl NetBSD 3.0 . . . . # # . # # ? # . # . . . . . . +dnl BeOS # # . # # # . # . ? . # ? . . . . . . +dnl mingw # # # # # # . # # . # # ? . # # # . . diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 new file mode 100644 index 0000000..1ac7b74 --- /dev/null +++ b/m4/rawmemchr.m4 @@ -0,0 +1,21 @@ +# rawmemchr.m4 serial 1 +dnl Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_RAWMEMCHR], +[ + dnl Persuade glibc to declare rawmemchr(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REPLACE_FUNCS([rawmemchr]) + if test $ac_cv_func_rawmemchr = no; then + HAVE_RAWMEMCHR=0 + gl_PREREQ_RAWMEMCHR + fi +]) + +# Prerequisites of lib/strchrnul.c. +AC_DEFUN([gl_PREREQ_RAWMEMCHR], [:]) diff --git a/m4/regex.m4 b/m4/regex.m4 index 4879bd8..38fb7ba 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 49 +#serial 52 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, # 2006, 2007, 2008 Free Software Foundation, Inc. @@ -17,7 +17,7 @@ AC_DEFUN([gl_REGEX], AC_CHECK_HEADERS_ONCE([locale.h]) AC_ARG_WITH([included-regex], - [AC_HELP_STRING([--without-included-regex], + [AS_HELP_STRING([--without-included-regex], [don't compile regex; this is the default on 32-bit systems with recent-enough versions of the GNU C Library (use with caution on other systems). @@ -37,13 +37,13 @@ AC_DEFUN([gl_REGEX], [gl_cv_func_re_compile_pattern_working], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT + [AC_INCLUDES_DEFAULT[ #if HAVE_LOCALE_H #include #endif #include #include - ], + ]], [[static struct re_pattern_buffer regex; unsigned char folded_chars[UCHAR_MAX + 1]; int i; @@ -218,6 +218,7 @@ AC_DEFUN([gl_PREREQ_REGEX], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) + AC_CHECK_HEADERS([libintl.h]) AC_CHECK_FUNCS_ONCE([isblank iswctype mbrtowc wcrtomb wcscoll]) AC_CHECK_DECLS([isblank], [], [], [#include ]) ]) diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index 4a471ac..e4c986d 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,16 +1,32 @@ -# rpmatch.m4 serial 5 -dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# rpmatch.m4 serial 7 +dnl Copyright (C) 2002-2003, 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free 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_RPMATCH], [ + dnl Persuade glibc to declare rpmatch(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REPLACE_FUNCS(rpmatch) if test $ac_cv_func_rpmatch = no; then + HAVE_RPMATCH=0 gl_PREREQ_RPMATCH fi ]) # Prerequisites of lib/rpmatch.c. -AC_DEFUN([gl_PREREQ_RPMATCH], [:]) +AC_DEFUN([gl_PREREQ_RPMATCH], [ + AC_CACHE_CHECK([for nl_langinfo and YESEXPR], gl_cv_langinfo_yesexpr, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(YESEXPR); return !cs;], + [gl_cv_langinfo_yesexpr=yes], + [gl_cv_langinfo_yesexpr=no]) + ]) + if test $gl_cv_langinfo_yesexpr = yes; then + AC_DEFINE([HAVE_LANGINFO_YESEXPR], 1, + [Define if you have and nl_langinfo(YESEXPR).]) + fi +]) diff --git a/m4/sleep.m4 b/m4/sleep.m4 index 2c9d75c..474ba07 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ -# sleep.m4 serial 1 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# sleep.m4 serial 2 +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free 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,13 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_SLEEP], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([sleep]) - if test $ac_cv_func_sleep = no; then + dnl We expect to see the declaration of sleep() in a header file. + dnl Older versions of mingw have a sleep() function that is an alias to + dnl _sleep() in MSVCRT. It has a different signature than POSIX sleep(): + dnl it takes the number of milliseconds as argument and returns void. + dnl mingw does not declare this function. + AC_CHECK_DECLS([sleep], , , [#include ]) + if test $ac_cv_have_decl_sleep != yes; then HAVE_SLEEP=0 AC_LIBOBJ([sleep]) gl_PREREQ_SLEEP diff --git a/m4/snprintf.m4 b/m4/snprintf.m4 index f21200d..6021786 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ -# snprintf.m4 serial 4 -dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. +# snprintf.m4 serial 5 +dnl Copyright (C) 2002-2004, 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free 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,17 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_SNPRINTF], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_cv_func_snprintf_usable=no AC_CHECK_FUNCS([snprintf]) - if test $ac_cv_func_snprintf = no; then + if test $ac_cv_func_snprintf = yes; then + gl_SNPRINTF_SIZE1 + case "$gl_cv_func_snprintf_size1" in + *yes) + gl_cv_func_snprintf_usable=yes + ;; + esac + fi + if test $gl_cv_func_snprintf_usable = no; then gl_REPLACE_SNPRINTF fi AC_CHECK_DECLS_ONCE([snprintf]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index bb6c34f..b255692 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 29 -dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. +# stdint.m4 serial 31 +dnl Copyright (C) 2001-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -240,7 +240,7 @@ AC_DEFUN([gl_STDINT_BITSIZEOF], dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into dnl config.h.in, dnl - extra AC_SUBST calls, so that the right substitutions are made. - AC_FOREACH([gltype], [$1], + m4_foreach_w([gltype], [$1], [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), [Define to the number of bits in type ']gltype['.])]) for gltype in $1 ; do @@ -265,7 +265,7 @@ AC_DEFUN([gl_STDINT_BITSIZEOF], AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result]) eval BITSIZEOF_${GLTYPE}=\$result done - AC_FOREACH([gltype], [$1], + m4_foreach_w([gltype], [$1], [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) ]) @@ -278,7 +278,7 @@ AC_DEFUN([gl_CHECK_TYPES_SIGNED], dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into dnl config.h.in, dnl - extra AC_SUBST calls, so that the right substitutions are made. - AC_FOREACH([gltype], [$1], + m4_foreach_w([gltype], [$1], [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]), [Define to 1 if ']gltype[' is a signed integer type.])]) for gltype in $1 ; do @@ -298,7 +298,7 @@ AC_DEFUN([gl_CHECK_TYPES_SIGNED], eval HAVE_SIGNED_${GLTYPE}=0 fi done - AC_FOREACH([gltype], [$1], + m4_foreach_w([gltype], [$1], [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))]) ]) @@ -311,7 +311,7 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into dnl config.h.in, dnl - extra AC_SUBST calls, so that the right substitutions are made. - AC_FOREACH([gltype], [$1], + m4_foreach_w([gltype], [$1], [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX], [Define to l, ll, u, ul, ull, etc., as suitable for constants of type ']gltype['.])]) @@ -337,9 +337,9 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], ui64)gltype1='unsigned __int64';; esac AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([$2 + [AC_LANG_PROGRAM([$2[ extern $gltype foo; - extern $gltype1 foo;])], + extern $gltype1 foo;]])], [eval gl_cv_type_${gltype}_suffix=\$glsuf]) eval result=\$gl_cv_type_${gltype}_suffix test "$result" != no && break @@ -350,7 +350,7 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], eval ${GLTYPE}_SUFFIX=\$result AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], $result) done - AC_FOREACH([gltype], [$1], + m4_foreach_w([gltype], [$1], [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])]) ]) diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index a40d418..60b4bd7 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 9 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# stdio_h.m4 serial 14 +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,6 +8,28 @@ AC_DEFUN([gl_STDIO_H], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([stdio.h]) + dnl No need to create extra modules for these functions. Everyone who uses + dnl likely needs them. + GNULIB_FPRINTF=1 + GNULIB_PRINTF=1 + GNULIB_VFPRINTF=1 + GNULIB_VPRINTF=1 + GNULIB_FPUTC=1 + GNULIB_PUTC=1 + GNULIB_PUTCHAR=1 + GNULIB_FPUTS=1 + GNULIB_PUTS=1 + GNULIB_FWRITE=1 + dnl This ifdef is just an optimization, to avoid performing a configure + dnl check whose result is not used. It does not make the test of + dnl GNULIB_STDIO_H_SIGPIPE or GNULIB_SIGPIPE redundant. + m4_ifdef([gl_SIGNAL_SIGPIPE], [ + gl_SIGNAL_SIGPIPE + if test $gl_cv_header_signal_h_SIGPIPE != yes; then + REPLACE_STDIO_WRITE_FUNCS=1 + AC_LIBOBJ([stdio-write]) + fi + ]) ]) AC_DEFUN([gl_STDIO_MODULE_INDICATOR], @@ -19,49 +41,69 @@ AC_DEFUN([gl_STDIO_MODULE_INDICATOR], AC_DEFUN([gl_STDIO_H_DEFAULTS], [ - GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) - GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) - GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) - GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) - GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) - GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) - GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) - GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) - GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) - GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) - GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) - GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) - GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) - GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) - GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) - GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) - GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) - GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) + GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF]) + GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) + GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF]) + GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) + GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) + GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) + GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF]) + GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) + GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF]) + GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) + GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) + GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) + GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) + GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) + GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) + GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) + GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) + GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) + GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) + GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) + GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) + GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) + GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE]) + GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC]) + GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC]) + GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR]) + GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) + GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) + GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) + GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) + GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) + GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) + GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE]) dnl Assume proper GNU behavior unless another module says otherwise. - REPLACE_FPRINTF=0; AC_SUBST([REPLACE_FPRINTF]) - REPLACE_VFPRINTF=0; AC_SUBST([REPLACE_VFPRINTF]) - REPLACE_PRINTF=0; AC_SUBST([REPLACE_PRINTF]) - REPLACE_VPRINTF=0; AC_SUBST([REPLACE_VPRINTF]) - REPLACE_SNPRINTF=0; AC_SUBST([REPLACE_SNPRINTF]) - HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF]) - REPLACE_VSNPRINTF=0; AC_SUBST([REPLACE_VSNPRINTF]) - HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF]) - REPLACE_SPRINTF=0; AC_SUBST([REPLACE_SPRINTF]) - REPLACE_VSPRINTF=0; AC_SUBST([REPLACE_VSPRINTF]) - HAVE_VASPRINTF=1; AC_SUBST([HAVE_VASPRINTF]) - REPLACE_VASPRINTF=0; AC_SUBST([REPLACE_VASPRINTF]) - REPLACE_FOPEN=0; AC_SUBST([REPLACE_FOPEN]) - REPLACE_FREOPEN=0; AC_SUBST([REPLACE_FREOPEN]) - HAVE_FSEEKO=1; AC_SUBST([HAVE_FSEEKO]) - REPLACE_FSEEKO=0; AC_SUBST([REPLACE_FSEEKO]) - REPLACE_FSEEK=0; AC_SUBST([REPLACE_FSEEK]) - HAVE_FTELLO=1; AC_SUBST([HAVE_FTELLO]) - REPLACE_FTELLO=0; AC_SUBST([REPLACE_FTELLO]) - REPLACE_FTELL=0; AC_SUBST([REPLACE_FTELL]) - REPLACE_FFLUSH=0; AC_SUBST([REPLACE_FFLUSH]) - HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM]) - HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE]) - REPLACE_GETLINE=0; AC_SUBST([REPLACE_GETLINE]) + REPLACE_STDIO_WRITE_FUNCS=0; AC_SUBST([REPLACE_STDIO_WRITE_FUNCS]) + REPLACE_FPRINTF=0; AC_SUBST([REPLACE_FPRINTF]) + REPLACE_VFPRINTF=0; AC_SUBST([REPLACE_VFPRINTF]) + REPLACE_PRINTF=0; AC_SUBST([REPLACE_PRINTF]) + REPLACE_VPRINTF=0; AC_SUBST([REPLACE_VPRINTF]) + REPLACE_SNPRINTF=0; AC_SUBST([REPLACE_SNPRINTF]) + HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF]) + REPLACE_VSNPRINTF=0; AC_SUBST([REPLACE_VSNPRINTF]) + HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF]) + REPLACE_SPRINTF=0; AC_SUBST([REPLACE_SPRINTF]) + REPLACE_VSPRINTF=0; AC_SUBST([REPLACE_VSPRINTF]) + HAVE_VASPRINTF=1; AC_SUBST([HAVE_VASPRINTF]) + REPLACE_VASPRINTF=0; AC_SUBST([REPLACE_VASPRINTF]) + HAVE_DECL_OBSTACK_PRINTF=1; AC_SUBST([HAVE_DECL_OBSTACK_PRINTF]) + REPLACE_OBSTACK_PRINTF=0; AC_SUBST([REPLACE_OBSTACK_PRINTF]) + REPLACE_FOPEN=0; AC_SUBST([REPLACE_FOPEN]) + REPLACE_FREOPEN=0; AC_SUBST([REPLACE_FREOPEN]) + HAVE_FSEEKO=1; AC_SUBST([HAVE_FSEEKO]) + REPLACE_FSEEKO=0; AC_SUBST([REPLACE_FSEEKO]) + REPLACE_FSEEK=0; AC_SUBST([REPLACE_FSEEK]) + HAVE_FTELLO=1; AC_SUBST([HAVE_FTELLO]) + REPLACE_FTELLO=0; AC_SUBST([REPLACE_FTELLO]) + REPLACE_FTELL=0; AC_SUBST([REPLACE_FTELL]) + REPLACE_FFLUSH=0; AC_SUBST([REPLACE_FFLUSH]) + REPLACE_FCLOSE=0; AC_SUBST([REPLACE_FCLOSE]) + HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM]) + HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE]) + REPLACE_GETLINE=0; AC_SUBST([REPLACE_GETLINE]) + REPLACE_PERROR=0; AC_SUBST([REPLACE_PERROR]) ]) dnl Code shared by fseeko and ftello. Determine if large files are supported, @@ -70,8 +112,8 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET], [ AC_CACHE_CHECK([whether stdin defaults to large file offsets], [gl_cv_var_stdin_large_offset], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], -[#if defined __SL64 && defined __SCLE /* cygwin */ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +[[#if defined __SL64 && defined __SCLE /* cygwin */ /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making fseeko/ftello needlessly fail. This bug was fixed in 1.5.25, and it is easier to do a version check than building a runtime test. */ @@ -79,7 +121,7 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET], # if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25) choke me # endif -#endif])], +#endif]])], [gl_cv_var_stdin_large_offset=yes], [gl_cv_var_stdin_large_offset=no])]) ]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index d9240b4..582db13 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,4 +1,4 @@ -# stdlib_h.m4 serial 6 +# stdlib_h.m4 serial 13 dnl Copyright (C) 2007, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,6 +8,9 @@ AC_DEFUN([gl_STDLIB_H], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([stdlib.h]) + AC_CHECK_TYPES([struct random_data], + [], [HAVE_STRUCT_RANDOM_DATA=0], + [[#include ]]) ]) AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], @@ -22,24 +25,38 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) + GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) + GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) + GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) + GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) + GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) + GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_CALLOC_POSIX=1; AC_SUBST([HAVE_CALLOC_POSIX]) - HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) - HAVE_MALLOC_POSIX=1; AC_SUBST([HAVE_MALLOC_POSIX]) - HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP]) - HAVE_REALLOC_POSIX=1; AC_SUBST([HAVE_REALLOC_POSIX]) - HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) - HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) - HAVE_UNSETENV=1; AC_SUBST([HAVE_UNSETENV]) - REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) - REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) - REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD]) - VOID_UNSETENV=0; AC_SUBST([VOID_UNSETENV]) + HAVE_ATOLL=1; AC_SUBST([HAVE_ATOLL]) + HAVE_CALLOC_POSIX=1; AC_SUBST([HAVE_CALLOC_POSIX]) + HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) + HAVE_MALLOC_POSIX=1; AC_SUBST([HAVE_MALLOC_POSIX]) + HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP]) + HAVE_REALLOC_POSIX=1; AC_SUBST([HAVE_REALLOC_POSIX]) + HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) + HAVE_RPMATCH=1; AC_SUBST([HAVE_RPMATCH]) + HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) + HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) + HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) + HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) + HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA]) + HAVE_SYS_LOADAVG_H=0; AC_SUBST([HAVE_SYS_LOADAVG_H]) + HAVE_UNSETENV=1; AC_SUBST([HAVE_UNSETENV]) + HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) + REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) + REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) + REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD]) + VOID_UNSETENV=0; AC_SUBST([VOID_UNSETENV]) ]) diff --git a/m4/strdup.m4 b/m4/strdup.m4 index 8796e9e..0537def 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,7 +1,6 @@ -# strdup.m4 serial 9 +# strdup.m4 serial 10 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software -dnl Foundation, Inc. +dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,5 +17,22 @@ AC_DEFUN([gl_FUNC_STRDUP], gl_PREREQ_STRDUP ]) +AC_DEFUN([gl_FUNC_STRDUP_POSIX], +[ + AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 + AC_LIBOBJ([strdup]) + else + AC_REPLACE_FUNCS(strdup) + fi + AC_CHECK_DECLS_ONCE(strdup) + if test $ac_cv_have_decl_strdup = no; then + HAVE_DECL_STRDUP=0 + fi + gl_PREREQ_STRDUP +]) + # Prerequisites of lib/strdup.c. AC_DEFUN([gl_PREREQ_STRDUP], [:]) diff --git a/m4/strerror.m4 b/m4/strerror.m4 index eb7d45a..8c16ca9 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ -# strerror.m4 serial 7 -dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. +# strerror.m4 serial 9 +dnl Copyright (C) 2002, 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRERROR], [ AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE]) - if test $gl_cv_func_working_strerror = no; then + if test $REPLACE_STRERROR = 1; then AC_LIBOBJ([strerror]) AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR], [Define this to 1 if strerror is broken.]) @@ -18,25 +18,38 @@ AC_DEFUN([gl_FUNC_STRERROR], AC_DEFUN([gl_FUNC_STRERROR_SEPARATE], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_CACHE_CHECK([for working strerror function], - [gl_cv_func_working_strerror], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [#include - ], - [return !*strerror (-2);])], - [gl_cv_func_working_strerror=yes], - [gl_cv_func_working_strerror=no], - [dnl Assume crossbuild works if it compiles. - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [#include - ], - [return !*strerror (-2);])], - [gl_cv_func_working_strerror=yes], - [gl_cv_func_working_strerror=no])])]) - if test $gl_cv_func_working_strerror = no ; then + AC_REQUIRE([gl_HEADER_ERRNO_H]) + if test -z "$ERRNO_H"; then + AC_CACHE_CHECK([for working strerror function], + [gl_cv_func_working_strerror], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[return !*strerror (-2);]])], + [gl_cv_func_working_strerror=yes], + [gl_cv_func_working_strerror=no], + [dnl Assume crossbuild works if it compiles. + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[return !*strerror (-2);]])], + [gl_cv_func_working_strerror=yes], + [gl_cv_func_working_strerror=no]) + ]) + ]) + if test $gl_cv_func_working_strerror = no; then + dnl The system's strerror() fails to return a string for out-of-range + dnl integers. Replace it. + REPLACE_STRERROR=1 + fi + else + dnl The system's strerror() cannot know about the new errno values we add + dnl to . Replace it. REPLACE_STRERROR=1 + fi + if test $REPLACE_STRERROR = 1; then gl_PREREQ_STRERROR fi ]) @@ -44,4 +57,12 @@ AC_DEFUN([gl_FUNC_STRERROR_SEPARATE], # Prerequisites of lib/strerror.c. AC_DEFUN([gl_PREREQ_STRERROR], [ AC_CHECK_DECLS([strerror]) + AC_CHECK_HEADERS_ONCE([sys/socket.h]) + if test $ac_cv_header_sys_socket_h != yes; then + dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make + dnl the check for those headers unconditional; yet cygwin reports + dnl that the headers are present but cannot be compiled (since on + dnl cygwin, all socket information should come from sys/socket.h). + AC_CHECK_HEADERS([winsock2.h]) + fi ]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 766d7e9..2d5553c 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -5,7 +5,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 6 # Written by Paul Eggert. @@ -35,6 +35,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) + GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) @@ -62,10 +63,12 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) + GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM]) HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY]) HAVE_DECL_MEMRCHR=1; AC_SUBST([HAVE_DECL_MEMRCHR]) + HAVE_RAWMEMCHR=1; AC_SUBST([HAVE_RAWMEMCHR]) HAVE_STPCPY=1; AC_SUBST([HAVE_STPCPY]) HAVE_STPNCPY=1; AC_SUBST([HAVE_STPNCPY]) HAVE_STRCHRNUL=1; AC_SUBST([HAVE_STRCHRNUL]) @@ -79,9 +82,11 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], HAVE_DECL_STRTOK_R=1; AC_SUBST([HAVE_DECL_STRTOK_R]) HAVE_DECL_STRERROR=1; AC_SUBST([HAVE_DECL_STRERROR]) HAVE_DECL_STRSIGNAL=1; AC_SUBST([HAVE_DECL_STRSIGNAL]) - REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) - REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) + HAVE_STRVERSCMP=1; AC_SUBST([HAVE_STRVERSCMP]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) - REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) + REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP]) REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) + REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) + REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) + REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) ]) diff --git a/m4/strndup.m4 b/m4/strndup.m4 index f7934ef..1be2a85 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ -# strndup.m4 serial 14 -dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc. +# strndup.m4 serial 15 +dnl Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,8 +18,8 @@ AC_DEFUN([gl_FUNC_STRNDUP], # AIX 4.3.3, AIX 5.1 have a function that fails to add the terminating '\0'. AC_CACHE_CHECK([for working strndup], gl_cv_func_strndup, [AC_RUN_IFELSE([ - AC_LANG_PROGRAM([#include - #include ], [[ + AC_LANG_PROGRAM([[#include + #include ]], [[ #ifndef HAVE_DECL_STRNDUP extern char *strndup (const char *, size_t); #endif diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index 53cbed2..c9b8951 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,17 +1,19 @@ -# strtoll.m4 serial 4 -dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. +# strtoll.m4 serial 5 +dnl Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free 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_REPLACE_FUNCS(strtoll) if test $ac_cv_func_strtoll = no; then + HAVE_STRTOLL=0 gl_PREREQ_STRTOLL fi fi diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index fcec3de..809d0bc 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,17 +1,19 @@ -# strtoull.m4 serial 4 -dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. +# strtoull.m4 serial 5 +dnl Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free 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_STRTOULL], [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) dnl We don't need (and can't compile) the replacement strtoull dnl unless the type 'unsigned long long int' exists. AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) if test "$ac_cv_type_unsigned_long_long_int" = yes; then AC_REPLACE_FUNCS(strtoull) if test $ac_cv_func_strtoull = no; then + HAVE_STRTOULL=0 gl_PREREQ_STRTOULL fi fi diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 1bc08a1..20c82ed 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 6 -*- Autoconf -*- -dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 10 -*- Autoconf -*- +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,6 +9,8 @@ dnl Test whether contains lstat and mkdir or must be substituted. AC_DEFUN([gl_HEADER_SYS_STAT_H], [ + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + dnl Check for lstat. Systems that lack it (mingw) also lack symlinks, so dnl stat is a good replacement. AC_CHECK_FUNCS_ONCE([lstat]) @@ -19,24 +21,7 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], fi AC_SUBST([HAVE_LSTAT]) - dnl Check for mkdir. Mingw has _mkdir(name) in the nonstandard - dnl instead. - AC_CHECK_DECLS([mkdir], - [], - [AC_CHECK_HEADERS([io.h])], - [#include ]) - if test $ac_cv_have_decl_mkdir = yes; then - HAVE_DECL_MKDIR=1 - else - HAVE_DECL_MKDIR=0 - fi - AC_SUBST([HAVE_DECL_MKDIR]) - if test "$ac_cv_header_io_h" = yes; then - HAVE_IO_H=1 - else - HAVE_IO_H=0 - fi - AC_SUBST([HAVE_IO_H]) + dnl For the mkdir substitute. AC_REQUIRE([AC_C_INLINE]) dnl Check for broken stat macros. @@ -45,4 +30,30 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], gl_CHECK_NEXT_HEADERS([sys/stat.h]) SYS_STAT_H='sys/stat.h' AC_SUBST([SYS_STAT_H]) + + dnl Define types that are supposed to be defined in or + dnl . + AC_CHECK_TYPE([nlink_t], [], + [AC_DEFINE([nlink_t], [int], + [Define to the type of st_nlink in struct stat, or a supertype.])], + [#include + #include ]) + ]) # gl_HEADER_SYS_STAT_H + +AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 +]) + +AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], +[ + GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) + GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_LCHMOD=1; AC_SUBST([HAVE_LCHMOD]) + REPLACE_LSTAT=0; AC_SUBST([REPLACE_LSTAT]) + REPLACE_MKDIR=0; AC_SUBST([REPLACE_MKDIR]) +]) diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index e8ccab1..5685273 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 11 +# unistd_h.m4 serial 16 dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -32,22 +32,37 @@ AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], AC_DEFUN([gl_UNISTD_H_DEFAULTS], [ - GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) - GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) - GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) - GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) - GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) - GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) - GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) - GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) - GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) - GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) - GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) - GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) + GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) + GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) + GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) + GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) + GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) + GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) + GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) + GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) + GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) + GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) + GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) + GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) + GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) + GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) + GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) + GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) + GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) + GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) + GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) + GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) + GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DUP2=1; AC_SUBST([HAVE_DUP2]) + HAVE_EUIDACCESS=1; AC_SUBST([HAVE_EUIDACCESS]) + HAVE_FSYNC=1; AC_SUBST([HAVE_FSYNC]) HAVE_FTRUNCATE=1; AC_SUBST([HAVE_FTRUNCATE]) + HAVE_GETDOMAINNAME=1; AC_SUBST([HAVE_GETDOMAINNAME]) + HAVE_GETDTABLESIZE=1; AC_SUBST([HAVE_GETDTABLESIZE]) + HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) + HAVE_GETUSERSHELL=1; AC_SUBST([HAVE_GETUSERSHELL]) HAVE_READLINK=1; AC_SUBST([HAVE_READLINK]) HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) @@ -55,9 +70,12 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_OS_H=0; AC_SUBST([HAVE_OS_H]) HAVE_SYS_PARAM_H=0; AC_SUBST([HAVE_SYS_PARAM_H]) REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) + REPLACE_CLOSE=0; AC_SUBST([REPLACE_CLOSE]) REPLACE_FCHDIR=0; AC_SUBST([REPLACE_FCHDIR]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN]) REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK]) + REPLACE_WRITE=0; AC_SUBST([REPLACE_WRITE]) + UNISTD_H_HAVE_WINSOCK2_H=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H]) ]) diff --git a/m4/utimens.m4 b/m4/utimens.m4 index 9ac9c3e..01a3184 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,8 +1,11 @@ -dnl Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software +dnl Foundation, Inc. dnl This file is free software; the Free 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 serial 2 + AC_DEFUN([gl_UTIMENS], [ AC_LIBOBJ([utimens]) @@ -11,5 +14,5 @@ AC_DEFUN([gl_UTIMENS], AC_REQUIRE([gl_FUNC_UTIMES]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF]) - AC_CHECK_FUNCS_ONCE([futimes futimesat]) + AC_CHECK_FUNCS_ONCE([futimes futimesat futimens utimensat]) ]) diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4 index accc79f..3b37d46 100644 --- a/m4/vsnprintf.m4 +++ b/m4/vsnprintf.m4 @@ -1,5 +1,5 @@ -# vsnprintf.m4 serial 4 -dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. +# vsnprintf.m4 serial 5 +dnl Copyright (C) 2002-2004, 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free 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,17 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_VSNPRINTF], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + gl_cv_func_vsnprintf_usable=no AC_CHECK_FUNCS([vsnprintf]) - if test $ac_cv_func_vsnprintf = no; then + if test $ac_cv_func_vsnprintf = yes; then + gl_SNPRINTF_SIZE1 + case "$gl_cv_func_snprintf_size1" in + *yes) + gl_cv_func_vsnprintf_usable=yes + ;; + esac + fi + if test $gl_cv_func_vsnprintf_usable = no; then gl_REPLACE_VSNPRINTF fi AC_CHECK_DECLS_ONCE([vsnprintf]) diff --git a/m4/wchar.m4 b/m4/wchar.m4 index 70b1248..5c923fa 100644 --- a/m4/wchar.m4 +++ b/m4/wchar.m4 @@ -1,13 +1,13 @@ dnl A placeholder for ISO C99 , for platforms that have issues. -dnl Copyright (C) 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar.m4 serial 4 +# wchar.m4 serial 6 AC_DEFUN([gl_WCHAR_H], [ @@ -18,7 +18,16 @@ AC_DEFUN([gl_WCHAR_H], wchar_t w;]], [gl_cv_header_wchar_h_standalone=yes], [gl_cv_header_wchar_h_standalone=no])]) - if test $gl_cv_header_wchar_h_standalone != yes; then + + AC_REQUIRE([gt_TYPE_WINT_T]) + if test $gt_cv_c_wint_t = yes; then + HAVE_WINT_T=1 + else + HAVE_WINT_T=0 + fi + AC_SUBST([HAVE_WINT_T]) + + if test $gl_cv_header_wchar_h_standalone != yes || test $gt_cv_c_wint_t != yes; then WCHAR_H=wchar.h fi @@ -36,6 +45,13 @@ wchar_t w;]], gl_CHECK_NEXT_HEADERS([wchar.h]) ]) +dnl Unconditionally enables the replacement of . +AC_DEFUN([gl_REPLACE_WCHAR_H], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + WCHAR_H=wchar.h +]) + AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], [ dnl Use AC_REQUIRE here, so that the default settings are expanded once only. @@ -49,6 +65,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) - WCHAR_H= - AC_SUBST([WCHAR_H]) + WCHAR_H=''; AC_SUBST([WCHAR_H]) ]) diff --git a/m4/wctype.m4 b/m4/wctype.m4 index 7483c4f..6a1b6f0 100644 --- a/m4/wctype.m4 +++ b/m4/wctype.m4 @@ -1,6 +1,8 @@ +# wctype.m4 serial 2 + dnl A placeholder for ISO C99 , for platforms that lack it. -dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,6 +11,7 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_WCTYPE_H], [ + AC_REQUIRE([AC_PROG_CC]) AC_CHECK_FUNCS_ONCE([iswcntrl]) if test $ac_cv_func_iswcntrl = yes; then HAVE_ISWCNTRL=1 @@ -30,7 +33,27 @@ AC_DEFUN([gl_WCTYPE_H], WCTYPE_H=wctype.h if test $ac_cv_header_wctype_h = yes; then if test $ac_cv_func_iswcntrl = yes; then - WCTYPE_H= + dnl Linux libc5 has an iswprint function that returns 0 for all arguments. + dnl The other functions are likely broken in the same way. + AC_CACHE_CHECK([whether iswcntrl works], [gl_cv_func_iswcntrl_works], + [ + AC_TRY_RUN([#include + #include + #include + #include + #include + int main () { return iswprint ('x') == 0; }], + [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no], + [AC_TRY_COMPILE([#include + #if __GNU_LIBRARY__ == 1 + Linux libc5 i18n is broken. + #endif], [], + [gl_cv_func_iswcntrl_works=yes], [gl_cv_func_iswcntrl_works=no]) + ]) + ]) + if test $gl_cv_func_iswcntrl_works = yes; then + WCTYPE_H= + fi fi dnl Compute NEXT_WCTYPE_H even if WCTYPE_H is empty, dnl for the benefit of builds from non-distclean directories. @@ -41,4 +64,11 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_WCTYPE_H]) AC_SUBST([WCTYPE_H]) + + if test "$gl_cv_func_iswcntrl_works" = no; then + REPLACE_ISWCNTRL=1 + else + REPLACE_ISWCNTRL=0 + fi + AC_SUBST([REPLACE_ISWCNTRL]) ]) diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index 04a9fc2..4bedefa 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ -# wcwidth.m4 serial 13 -dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# wcwidth.m4 serial 14 +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -80,6 +80,6 @@ int main () fi if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then - WCHAR_H=wchar.h + gl_REPLACE_WCHAR_H fi ]) diff --git a/m4/write.m4 b/m4/write.m4 new file mode 100644 index 0000000..812b19b --- /dev/null +++ b/m4/write.m4 @@ -0,0 +1,20 @@ +# write.m4 serial 1 +dnl Copyright (C) 2008 Free Software Foundation, Inc. +dnl This file is free software; the Free 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_WRITE], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + dnl This ifdef is just an optimization, to avoid performing a configure + dnl check whose result is not used. It does not make the test of + dnl GNULIB_UNISTD_H_SIGPIPE or GNULIB_SIGPIPE redundant. + m4_ifdef([gl_SIGNAL_SIGPIPE], [ + gl_SIGNAL_SIGPIPE + if test $gl_cv_header_signal_h_SIGPIPE != yes; then + REPLACE_WRITE=1 + AC_LIBOBJ([write]) + fi + ]) +]) diff --git a/po/bg.gmo b/po/bg.gmo index f32845d55f528220aba75ec636eba54237034c9b..0dc4e4a00eb7f6b7408794271450f339c6611363 100644 GIT binary patch delta 10433 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 H>K*@o<+h~q delta 10666 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 diff --git a/po/bg.po b/po/bg.po index b5d7e88..1e9e5c9 100644 --- a/po/bg.po +++ b/po/bg.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.16\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2006-11-23 22:40+0200\n" "Last-Translator: Anton Zinoviev \n" "Language-Team: Bulgarian \n" @@ -87,7 +87,7 @@ msgstr " [ОПЦИЯ...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Използвайте „%s --help“ or „%s --usage“ за повече информация.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -98,15 +98,15 @@ msgstr "" msgid "Unknown system error" msgstr "Непозната системна грешка" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "показва тази справка" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "показва кратко съобщение за използването" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "ИМЕ" @@ -119,11 +119,11 @@ msgstr "посочва името на програмата" msgid "SECS" msgstr "СЕК" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "спира за СЕК секунди (подразбира се 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "показва версията на програмата" @@ -141,7 +141,7 @@ msgstr "%s: Твърде много аргументи\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(ДЕФЕКТ В ПРОГРАМАТА) Опцията би трябвало да е била разпозната!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -200,16 +200,16 @@ msgstr "%s: опцията „-W %s“ е двусмислена\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: опцията „-W %s“ не допуска аргумент\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "паметта е изчерпана" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Не може да се смени работният каталог" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Не може да се запази работният каталог" @@ -330,11 +330,23 @@ msgstr "„" msgid "'" msgstr "“" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[дДoOyY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[нНkKnN]" @@ -535,104 +547,104 @@ msgstr "Преждевременен край на файла" msgid "Garbage command" msgstr "Непозната команда" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Това не прилича на tar-архив" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Общо записани байтове" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Общо прочетени байтове" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Общо изтрити байтове: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Неправилна стойност на record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Не е посочено име на архив" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Не може да се проверяват архиви на стандартните вход/изход" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архивът е компресиран. Използвайте опцията %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Не може да се актуализират компресирани архиви" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "В началото на лентата, край на изпълнението" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Твърде много грешки, край на изпълнението" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Размер на записа = %lu блок" msgstr[1] "Размер на записа = %lu блока" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, 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:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Невъзможно е връщане назад в архивния файл; той може да е нечитаем без опция " "-i" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не завърши при граница на запис" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: съдържа неправилен номер на том" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Препълване на номера на том" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Подгответе том №%d за %s и натиснете return: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF, когато се очакваше отговор от потребителя" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ВНИМАНИЕ: Архивът е незавършен" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -644,65 +656,66 @@ msgstr "" " q Прекратява tar\n" " y или return Продължава изпълнението\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Поражда вторична командна обвивка\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Извежда този списък\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Няма повече томове; изход.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Не е посочено име на файл. Опитайте отново.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Неправилна команда. Използвайте ? за справка.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "командата %s не успя" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s вероятно продължава в този том: заглавният запис съдържа отрязано име" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продължава с този том" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s е грешен размер (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Този том е извън поредицата" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Архивът не е етикетиран да отговаря на %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Томът %s не съответства на %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -710,6 +723,11 @@ msgstr "" "%s: името на файла е твърде дълго, за да се побере в заглавен запис на " "многотомен ГНУ-архив и бе съкратено" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "EOF на архив %s не е на границата на блок" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -721,8 +739,8 @@ msgstr[1] "Само %lu от %lu байта можаха да се прочет msgid "Contents differ" msgstr "Съдържанието се различава" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Неочакван знак за край (EOF) в архива" @@ -841,7 +859,7 @@ msgstr[1] "%s: Файлът намаля с %s байта; допълва се msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файлът е в друга файлова система; не се архивира" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -870,7 +888,7 @@ msgstr "%s: файлът е архив; не се архивира" msgid "%s: File removed before we read it" msgstr "%s: Файлът бе изтрит преди да бъде прочетен" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 #, fuzzy msgid "directory not dumped" msgstr "%s: каталогът е обозначен като кеш; не се архивира" @@ -923,165 +941,165 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "Продължаващи файлове се извличат като обикновени файлове" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Опитва се извличането на символни връзки като твърди" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Чете се %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Не може да се извлича -- файлът продължава с друг том" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Неочаквано дълъг заглавен запис" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Непознат файлов тип „%c“, извлича се като обикновен файл" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Текущият %s е по-нов или със същата възраст" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Не можа да се направи резервно копие на този файл" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Бе невъзможно %s да се преименува на %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Грешката е непоправима: край на изпълнението" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталогът бе преименуват от %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталогът бе преименуван" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Каталогът е нов" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Записано е неправилно време" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Неправилно време на промяна (секунди)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Неправилно време на промяна (наносекунди)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Неправилен номер на устройство" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Неправилен номер на i-възел" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Твърде дълго поле при четене на snapshot-файл" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Грешка при четене в snapshot-файл" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Неочакван край на snapshot-файл" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Неочаквана стойност на поле в snapshot-файл" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Липсва завършител на записа" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Грешен инкрементален файлов формат" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Неподдържана версия на инкрементален формат: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Лошо формиран dumpdir: очаква се „%c“, а вместо това има %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Лошо формиран dumpdir: „X“ е дублиран" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Лошо формиран dumpdir: празно име в „R“" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Лошо формиран dumpdir: „T“ не се предхожда от „R“" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Лошо формиран dumpdir: празно име в „T“" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Лошо формиран dumpdir: очаква се „%c“, вместо това данните свършват" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Лошо формиран dumpdir: „X“ никога не се използва" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Не може да се създаде временен каталог, използвайки шаблона %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталогът не се изчиства: не може да се достъпи" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: каталогът е на друго устройство: не се изчиства" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Изтрива се %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Не може да се изтрие" @@ -1101,19 +1119,19 @@ msgstr "блок %s: ** Блок от знаци NUL **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Край на файла **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1121,69 +1139,69 @@ msgstr "" "е допълнение до две" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Осмичната стойност %.*s в архива е извън диапазона за %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Архивът съдържа архаични заглавни записи по модул 64 (6 битови)" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Архивът е подписан с низ по модул 64 %s, който е е извън диапазона за %s" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Стойността %s в архива е извън допустимия диапазон за %s (%s..%s)" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " връзка към %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " непознат файлов тип %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Дълга връзка--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Дълго име--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Заглавен запис на тома--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продължава при байт %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Създава се каталог:" @@ -1220,24 +1238,24 @@ msgstr "междупроцесен канал" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Във файловите имена са използвани „*“ и „?“. Моля," -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "използвайте --wildcards, за да позволите съпоставяне с образци," -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "или --no-wildcards, за да не се извежда това предупреждение." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Не е открит в архива" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Необходимо срещане не е открито в архива" @@ -1264,7 +1282,7 @@ msgstr "" "Непознат начин за извеждане на спец. знаци „%s“. Използвайте „%s --quoting-" "style=help“, за да получите списък." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1283,7 +1301,7 @@ msgstr "" "tar\n" " tar -xf архив.tar # Извлича от архив.tar всички файлове\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1305,86 +1323,86 @@ msgstr "" "иначе\n" " never, simple винаги да се правят прости резервни копия\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Вид основно действие:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "изрежда съдържанието на архив" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "извлича файлове от архива" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "създава нов архив" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "намира разликите между архива и файловата система" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "добавя файлове в края на архив" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "добавя само файлове, по-нови от копието в архива" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "прибавя tar-файлове към архива" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "трие файлове от архива (не при магнитни ленти!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "проверява етикета на тома и завършва" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Модификатори на действието:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "работи ефективно с разредени файлове" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "ГОЛЯМ[.МАЛЪК]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "определя версията на формата разредени файлове (влече --sparse)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "със стар формат ГНУ за инкрементално архивиране" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "с новия формат на ГНУ за инкрем. архивиране" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "при нечитаеми файлове не завършва с грешка" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1396,118 +1414,118 @@ msgstr "" "list и когато списъкът от файлове е зададен или на командния ред, или с " "опция -T. Ако не е посочен N, се подразбира 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "архивът е с произволен достъп" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Регулиране заместването на файлове:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "след записа опитва да провери архива" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "изтрива файловете след като ги добави в архива" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "при извличане не замества съществуващи файлове" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "не замества съществуващи файлове, ако са по-нови от копията им в архива" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "при извличане замества съществуващи файлове" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "изтрива всеки файл преди да извлича върху него" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "изпразва йерархията преди извличане на каталог" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "запазва метаданните на съществуващи каталози" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "при извличане замества метаданните на съществуващи каталози (подразбира се)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Избор на изходен поток:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "извлича файловете на стандартния изход" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "подава с канал всеки извлечен файл към КОМАНДА" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "игнорира кода на завършване на породени процеси" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "счита за грешка всеки ненулев код на завършване на породен процес" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Подход спрямо файловите атрибути:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "прави ИМЕ да е собственик на добавените файлове" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "прави ИМЕ да бъде групата на добавените файлове" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "прави времето на промяна на добавяни файлове като ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "ПРОМЕНИ" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "модифицира режима за достъп на добавени файлове" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1517,29 +1535,29 @@ msgstr "" "времената след четене (при МЕТОД=„replace“, подразбира се), или не променя " "имената изобщо (МЕТОД=„system“)" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "не извлича времето на промяна на файловете" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "опитва да възстановява собствеността на файловете" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "извлича файловете от ваше име" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "използва числа вместо имена за потребител и група" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "възстановява точно (без umask) режима на достъп (подразбира се при " "привилегирован потребител)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1547,15 +1565,15 @@ msgstr "" "прилага umask на потребителя при извличане на файлове (подразбира се при " "обикновен потребител)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "файловете за извличане са сортирани според архива" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "същото като едновременно -p и -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1563,139 +1581,139 @@ msgstr "" "забавя настройката на времето на промяна и режима за достъп на извличаните " "каталози докато извличането завърши" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "отменя ефекта на --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Избор на устройство и смяна:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "АРХИВ" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "използва архивния файл или устройство АРХИВ" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "архивният файл е локален дори при двуеточие" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "използва посочената КОМАНДА вместо rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "използва посочената КОМАНДА вместо rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "посочва устройство и гъстота" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "създава/извежда/извлича многотомен архив" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "смяна на лентата след запис на 1024 x N байта" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "изпълнява скрипт в края на всяка лента (влече -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "ползва от и обновява във ФАЙЛ номера на тома" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Блокуване на устройството:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "БЛОКОВЕ" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "БЛОКОВЕ x 512 байта в секунда" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "прави N-байтови записи, кратно на 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "пренебрегва блоковете от нули и продължава" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "преформира при четене блоковете (канали 4.2BSD)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Избор на архивен формат:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "създава архив с посочения формат" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "ФОРМАТ е някой от следните:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "стар формат tar, V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "формат на ГНУ при tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "формат на версия 1.13.x на tar на ГНУ" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "същото като pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "същото като --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "същото като --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ключдума[[:]=стойност][,ключдума[[:]=стойност]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "управляващи ключови думи за pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1703,180 +1721,193 @@ msgstr "" "създава архив с име на том ТЕКСТ; при извеждане или извличане сравнява името " "на тома с ТЕКСТ" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Противоречащи си опции за компресиране" -#: src/tar.c:594 +#: src/tar.c:596 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Не може да се пише към компресиращата програма" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "прекарва архива през bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "прекарва архива през gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "прекарва архива през compress" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "прекарва архива през gzip" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "прекарва архива през gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "прекарва архива през ПРОГ (трябва да приема -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Избор на локален файл:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "добавя посочения ФАЙЛ към архива (полезно е, ако името му започва с минус)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "КАТ" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "работи в каталога КАТ" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "взема имената за извличане или създаване от ФАЙЛ" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T чете имена, завършващи с нулев байт" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "декодира „\\“ във файловите имена на -T (подразб.)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "не декодира „\\“ във файловите имена на -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "ОБРАЗЕЦ" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "без файловете, отговарящи на ОБРАЗЕЦ" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "пропуска файловете, отговарящи на образци в ФАЙЛ" -#: src/tar.c:631 +#: src/tar.c:640 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:644 +#: src/tar.c:653 #, fuzzy msgid "exclude directories containing FILE" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "без автоматично влизане в подкаталозите" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "работи в рамките на локалната файлова система" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "влиза рекурсивно в подкаталозите (подразбира се)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "не маха „/“ в началото на файлови имена" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "следва симв. връзки; архивира сочените файлове" -#: src/tar.c:658 +#: src/tar.c:667 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "следва симв. връзки; архивира сочените файлове" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "ЧЛЕН-ИМЕ" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "започва от файл с име ЧЛЕН-ИМЕ в архива" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "съхранява само файлове, по-нови от ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "сравнява времето само ако данните са променени" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "МЕТОД" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "резервно копира съществуващи файлове с МЕТОД" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "НИЗ" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1885,89 +1916,89 @@ msgstr "" "освен ако не е бил сменен с променливата от обкръжението " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Промени на файловите имена:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "при извличане маха N начални каталози от файловите пътеки" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "ИЗРАЗ" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "преобразува файловите имена, използвайки посочения ИЗРАЗ за замяна на sed" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Съпоставяне с файлови имена (влияе и на включващи, и на изключващи образци):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "пренебрегва разликата между големи/малки букви" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "съпоставянето с образците започва от началото на файловото име" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "съпоставянето започва след кой да е „/“ (подразбира се при изключване)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "отчита се разликата между малки и големи букви (подразбира се)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "ползва „*“ и „?“ (подразбира се за изключване)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "дословно низово сравнение" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "„/“ не пасва с „*“ и „?“" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "„/“ пасва с „*“ и „?“ (подразб. за изключване)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Извеждане на информация:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "подробно изрежда обработените файлове" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "извежда напредъка след всеки N-ти запис (подразбира се 10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "съобщава, ако не всички твърди връзки са включени" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1978,27 +2009,27 @@ msgstr "" "извежда текущите байтове при получаване на СИГНАЛ. Допустими СИГНАЛи са " "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2; имената без SIG също са позволени" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "извежда времената по Гринуич" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "изпраща подробния изход във ФАЙЛ" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "показва номера на блок в архива с всяко съобщение" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "изисква потвърждение за всяко действие" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "показва подразбираното от tar" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2006,32 +2037,32 @@ msgstr "" "при извеждане или извличане изрежда всеки каталог, който се пропуска по " "някаква причина" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "показва преобразуваните файлови имена в архива" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "НАЧИН" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "начин за цитиране на специални знаци; вж. по-долу за стойностите на НАЧИН" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "работи и със знаците от НИЗ като със специални" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "не работи със знаците от НИЗ като със специални" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Опции за съвместимост:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2039,56 +2070,56 @@ msgstr "" "при създаване е същото като --old-archive; при извличане е същото като --no-" "same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Други опции:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "забранява някои потенциално опасни опции" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Не може да се използва повече от една опция „-Acdtrux“" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Противоречащи си опции за компресиране" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Непознато име на сигнал: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Не е открит еталлонният файл за дата" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Използва се %s вместо непознатия файлов формат за дата %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Опция %s: Датата „%s“ се разглежда като %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: файловият списък вече е прочетен" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: файловото име съдържа нулев байт" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Правилни аргументи за опциите --quoting-style са:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2096,152 +2127,166 @@ msgstr "" "\n" "*Този* tar подразбира следното:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Неправилен фактор за блокуване" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Внимание: опцията -I не се поддържа. Може би имате предвид -j или -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Неправилна дължина на лента" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Повече от една ограничителна дата" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Неправилна версия на формат разредени файлове" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' не се поддържа на тази платформа" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "стойността на --checkpoint не е цяло число" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Неправилна група" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "На опция е подаден неправилен режим" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Неправилно число" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Неправилен собственик" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Неправилен размер на запис" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Размерът на запис трябва да е кратен на %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Неправилен брой елементи" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Позволява се само една опция --to-command" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Лошо образуван аргумент за гъстота: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Непозната гъстота: „%c“" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Опциите „-[0-7][lmh]“ не се поддържат от *този* tar" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Старата опция „%c“ изисква аргумент." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "без списък файлове опцията --occurrence е безсмислена" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "не може да се използва --occurrence при пожелания начин на работа" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Използването на много архивни файлове изисква опция „-M“" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Не може да се съчетават --listed-incremental с --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Не може да се проверяват многотомни архиви" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Не може да се проверяват компресирани архиви" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Не може да се използват многотомни компресирани архиви" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Не може да се съединяват компресирани архиви" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" "опцията --pax-option може да се използва само при архиви във формат POSIX" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Страхлив отказ да се създава празен архив" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Опциите „-Aru“ са несъвместими с „-f -“" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Трябва да посочите поне една от опциите „-Acdtrux“" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Изходът с грешка бе забавен поради предхождащи грешки" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2250,53 +2295,53 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Файлът намаля с %s байт" msgstr[1] "%s: Файлът намаля с %s байта" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Ключовата дума %s е непозната или все още не е реализирана" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Образецът %s не може да се използва" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ключовата дума %s не може да се отмени" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Лошо формиран разширен заглавен запис: не е посочена дължина" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Дължината на разширен заглавен запис е извън допустимия диапазон" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "Дължината %*s на разширен заглавен запис е извън допустимия диапазон" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Лошо формиран разширен заглавен запис: липсва интервал след дължината" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Лошо формиран разширен заглавен запис: липсва знак за равенство" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Лошо формиран разширен заглавен запис: липсва знак за нов ред" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" "Пренебрегва се непознатата ключова дума „%s“ за разширен заглавен запис" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2305,28 +2350,28 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Разширеният заглавен запис %s=%s е извън диапазона %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Неправилно формиран разширен заглавен запис: неправилен %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Неправилно формиран разширен заглавен запис: прекомерен %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Лошо формиран разширен заглавен запис: неправилен %s; очаква се разделител %c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2504,103 +2549,117 @@ msgstr "Номер извън допустимия диапазон: %s" msgid "Negative size: %s" msgstr "Отрицателен размер: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "не успя stat(%s)" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Грешка при анализа на число до „%s“" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Непознат формат за дата" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[АРГУМ...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "Не може да се отвори „%s“" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Не може да се изпълни %s" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "името на файла съдържа нулев байт" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "не може да се създават разредени файлове на стандартния изход, използвайте " "опцията --file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "неправилна маска (до „%s“)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Непознато поле „%s“" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "не може да се смени времето на „%s“" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Командата завърши успешно\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Командата завърши с код %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Командата бе прекратена със сигнал %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Командата бе спряна със сигнал %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Командата генерира core\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Командата бе прекратена\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat изисква файлови имена" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "твърде много аргументи" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "отменя ефекта на --delay-directory-restore" + #~ msgid "block size" #~ msgstr "блоковият размер" @@ -2630,6 +2689,9 @@ msgstr "твърде много аргументи" #~ msgid "[.]NUMBER" #~ msgstr "[.]N" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Изходът с грешка бе забавен поради предхождащи грешки" + #~ msgid "Time stamp out of range" #~ msgstr "Записано е време извън допустимия диапазон" @@ -2718,9 +2780,6 @@ msgstr "твърде много аргументи" #~ msgid "WARNING: No volume header" #~ msgstr "ВНИМАНИЕ: Томът е без заглавна част" -#~ msgid "Archive %s EOF not on block boundary" -#~ msgstr "EOF на архив %s не е на границата на блок" - #~ msgid "Only read %d bytes from archive %s" #~ msgstr "Прочетени са само %d байта от архив %s" diff --git a/po/cs.gmo b/po/cs.gmo index 1ef796060b33a1dd4b37fd7437bc43caa30f2f57..77d2d0db77dfdc87e762404bb59cd66728f5d45c 100644 GIT binary patch delta 3173 zcmYk-eUMgF9S873ED*B11j^PHy5Q~xEy(V&vY|n>;fhEpDj9@XD=NN$2nlBP1S(?m z#xOLIQZ}PyY1p_;)7I2r43lHiI8JXenlTJhnbXi8)i7An=lkqs#xwi7pL5T1@44sx z&N+8~f8Cye+AEVA_7r88c$avzp_FGhd#r=f*;tCd(&aFfi#UTT*vc&&&wb4OPjD`u zijU1 zvDcXgons!;Pah?z3@`(}gC0@7#TE|IU-{ix@}G|X?kuTnG;z71n_jY9%WiI9I((G5 z{zn|gKhPp7N0|;!(pbtQjd{a1S~jJR8NlV0YbZHoOOyQP4R>lVP33!RStWO0q;AZoi``W3ivaF_(k*r}-zL~BqyP1JJ z$y_+Zbo2s~iT|>mF?&k2bTf->8S|ixReO!e$ll8R9OL{T^Ss)xRb;LFmDw(Da51O( zbsh(J9>2yBJj8ltc!u+1%zekJ_6dGW$~%~~uz(rBO6t0-V>0+4t({u=Ms>k2ILZ&d zWp=}1rh_9)iZf4F8bKHHfcrf)9qwiZu-_qz@Hb56{znu}rDKFq=wr2l7 zt&$P_kzS(wjqhed%Wy}tnf3+DB3i+0%bS=t+s#bT|qwke5QR7Gr*5CBfp(}{5rEJUt->DwBF}%A(!zMCIdg= zOde$x_c){JVQahmFIHKpK_BIt)ei@mZFz!oIn`5>nSPqivX*`-4=}&)XA57UXOvUb zd7G!!?_<`?TIRkxneWTKnewk*o^r?>y~w2OIMdM#!+$TAFe%&03%Q4x>lY|_1VFH zn))uAm^pof)?XQ72KX}lmH#;8L9IR_Y42qEUrHITl>wEvYPgF@-8Q!H+sqsPk{{wx zW?QwJaM>=aIfC1njP2l9KFJK|$IKdfo@4kAW-a`inTjSKh5G;h4wZ=-mNIX&s{VtH zIm-EC9L*<~Ogzm6e2E#rr^F_am&mreSfpg#e5qa=9(dN*r6TL$YOzw>Wc}4gjrx|l zo*Tsb#5E#oBjrwUMZGqBNUHO8$;5WQlvNZPLxcZrXRl-q`>|4&FYbD9N~@)^+}T0~xKjY!H*mwdeL6^q4vV)gK4 zYD!Z3<}%XBR*}{H3Gtvv+EeBU>#|%cwu!ak&1IlEnZQfL`0D&tt{3aX{Cb;Vez{)p zb*s#r-!B%5tlT!SRD521MJy9LM5EX)wusYZl}h&aimKrvzF#~bTE!>D$HYD2GVzh5 zX_2^HY!qJ=`S0{Wk+N%;`f;vfR`y$}wmWDImL=8sPJXtkU(PJrd?RkD+OFieqFsDI zEEnTH?QpY5`S9)yXH1!Xw^}yXRcTVbD8`6v&TO1AxU%upv4b~Ho!&6`{pQspCvF#am?7X0-r=zob@XWKfj~g7CHPkTp@OcYH{vUAOBp(0( delta 3384 zcmZY9d2AGA7{~FqP>vqZg91`oIzBZnjf35H9DwIh&tJwIyp1WC z&YzQT1}5TqjKh66)R>@om&#x+oW)qYh9mG6CSc6KP=}*X4^GGXuoCIRcySyC@qT;{ zHPA0n?R23A932xf2h~qGj-Y>2LnV(3?WhKhVJcq2VR*+efv3iDo{h;^g=yI4T;GRT zoS#Dr@8D=0&Zy(D1eK9_j(!ZIf3uTHUwj?a;hU%jPGAOpj0N~7Y5Tb8$avsy@fy6e_<_QG>bUTQ|(X;kXX+VLVuGuu%E?m)UQ7tq4%$j^iiA^&PPkqH}vlTj(HMLoC)d1>EI4 zhVP=Di)IByVK(wJ#T?XdIWk7mfO^w4$Z|5fPy;#Scxov5CtKzs7xbprk!dqwtgvW| zM>UXwYIrj8Gvyp~UlVG;t5KQjKxODN%)@_B&*d?%nv&_L0eex;tqoG4Pjdh@kW;AC zUqGHUH&Fu#XYc5~I8;L!s7zE~cg9eweG~GCc^kF(K0bQgh*)@w$4f=5!zJ~euHD==g(h`P~Q5l-TArh-l&(%5CH=t7Afm$0!Q5|1I#u79? zQc)_Ee=Vjs)C~pL2WO&o#~f4x^HHf@j&m8oAyfx<>6HdeBsXaQX{bdx4VA%qq$|^k zdVU*bYX5&orI-u9qP}PuR%k%8k(V`#QHygGs-gX;>qk+G=^SdCev2A-Br8)>m4bYG zOc54fDeAt}s0<&(Li#tSsi=cLP$N#_poXR*mrMl~VF3A=cQ|NnKS2%TwqpY6)1u2o zWwM%sUTC9p{V-}5T|qq`%b!6lo+2uGlZB`hEpyz0VVoaEt&t~Pg8eT-&G=phf*Nc&9HXh8u&8WQEiM zfokvsPQa_E%njwWCt)UP&g+pZn*eJ2?Ls|&5VbbWpuP)Nf>hMN@2COveQ?(0JOHj#WJG_{4u`ZQ%ovWyos&^^elLGwNp zb@+qx$1PMxkxaCvU?ld(iKrBopoK0}Cfe~4>_Ba^pHLkovB|@*6qUId7=g{Gfdw#G z`+qByeq1<$S{%nwQ}Pw6!ECQ3)bMuVW#V3`q@uZ8Nhm|l5lW>>H1S|}Ewp2_JLu22ookwka;Lt`Q7@^Y z>^?@2eiPimL2sk-LI@MUCBy>f+>6S9=DioOn6QZ^;w7S;=vnmknv$MHA1Y0QcH8rW zMNop>se7oq{@;U-(*eX&L<_Nsm_@`APY`uP4KbCNOY|%$oM`c?tPj!sp(>{CB4!dR zy04S}SE$S*26kUCrZ+z9)T=R-*yfyxqL0WzVyjMil%+lDs!k`GiF#r-v51&YXaPx1kL^$CmG{8Z`6e5EtBvd@aa-x-JAYLTq5U&y{69{cbmHtFF zp=}pWL=whoZge+Uokh`?BU0@ZjjdL#-Rx?!Yppu3r^Q<8wF8YFzt6J0UXRz;88sw5 zJgK44X9YaX{ubM!=JB^$o;u5CFZ0{(n$FzB#k~jSj?c;)Z{-yf=T6Mb&F|csyfG@- zWmW&u;HO1Tz1P*^x7;pYtE<^%)iktKyE;=dPKIYx*zQ)3%B}`a=jE*8-v0u-a96qj diff --git a/po/cs.po b/po/cs.po index fd2405e..0ff1824 100644 --- a/po/cs.po +++ b/po/cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2001-09-01 10:55+0200\n" "Last-Translator: Vladimir Michl \n" "Language-Team: Czech \n" @@ -89,7 +89,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Více informací získáte pøíkazem `%s --help'.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -101,15 +101,15 @@ msgstr "" msgid "Unknown system error" msgstr "Neznámá systémová chyba" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -122,11 +122,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -144,7 +144,7 @@ msgstr "%s: p msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -203,16 +203,16 @@ msgstr "%s: p msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: pøepínaè `-W %s' musí být zadán bez argumentu\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "pamì» vyèerpána" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Pracovní adresáø nelze zmìnit" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Pracovní adresáø nelze uchovat" @@ -332,11 +332,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -539,103 +551,103 @@ msgstr "P msgid "Garbage command" msgstr "Neznámý pøíkaz" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Toto pravdìpodobnì není tar archiv" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Celkem zapsáno bajtù: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Celkem zapsáno bajtù: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(roura)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Chybná hodnota pro velikost záznamu" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Název archivu nebyl zadán" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Stdin/Stdout archiv nelze ovìøit" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Komprimovaný archiv nelze aktualizovat" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Páska na zaèátku, konèím" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Pøíli¹ mnoho chyb, konèím" -#: src/buffer.c:678 -#, fuzzy, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "Nezarovnaný blok (%lu bajtù) v archivu" -msgstr[1] "Nezarovnaný blok (%lu bajtù) v archivu" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Velikost záznamu = %lu blokù" msgstr[1] "Velikost záznamu = %lu blokù" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, fuzzy, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "Nezarovnaný blok (%lu bajtù) v archivu" +msgstr[1] "Nezarovnaný blok (%lu bajtù) v archivu" + +#: src/buffer.c:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: obsahuje neplatné èíslo svazku" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "U èísla svazku nastalo pøeteèení" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Místo u¾ivatelské odpovìdi byl zadán konec souboru" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "VAROVÁNÍ: Archiv je nekompletní" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -647,69 +659,74 @@ msgstr "" " ! Vytvoøení podshell\n" " ? Vypísání této nápovìdy\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Není nový svazek; konèím.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "pøíkaz `%s' selhal" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s nepokraèuje na tomto svazku" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s nepokraèuje na tomto svazku" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je ¹patné délky (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tento svazek není následníkem pøedchozího" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Pro vyhodnocení vzorku `%s' musí být archiv pojmenován" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Svazek %s neodpovídá vzorku %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -721,8 +738,8 @@ msgstr[1] "Lze msgid "Contents differ" msgstr "Obsah se li¹í" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Neoèekávaný konec archivu" @@ -839,7 +856,7 @@ msgstr[1] "%s: Soubor je krat 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -868,7 +885,7 @@ msgstr "%s: soubor je archiv; nearchivov msgid "%s: File removed before we read it" msgstr "%s: Soubor smazán døíve ne¾ mohl být èten" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -919,168 +936,168 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "Souvisle ulo¾ené soubory rozbaluji jako obyèejné soubory" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Zkou¹ím rozbalit symbolické odkazy jako pevné odkazy" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Ètení z %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Neoèekávaný konec v rozsekaném názvu" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Neznámý typ souboru `%c', rozbalen jako normální soubor" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tento soubor nebylo mo¾né zálohovat" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: nelze pøejmenovat na %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Z chyby se nelze zotavit: ukonèuji se" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Adresáø byl pøejmenován" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Adresáø byl pøejmenován" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Adresáø je nový" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Neplatný èas souboru" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Zadána chybná práva" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Neplatné èíslo zaøízení" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Neplatné èíslo i-uzlu" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekávaný konec archivu" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Pro blokový faktor (blokù na záznam) %d není mo¾né alokovat pamì»" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: soubor je na jiném souborovém systému; nearchivován" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Ma¾u %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nelze smazat" @@ -1100,87 +1117,87 @@ msgstr "blok %s: ** Blok NUL **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec souboru **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiv obsahuje zastaralé base-64 hlavièky" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " odkaz na %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " neznámý souborový typ %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Hlavièka svazku--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Pokraèováno od %s bajtu--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Vytváøím adresáø:" @@ -1217,24 +1234,24 @@ msgstr "meziprocesov #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: V archivu nenalezen" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: V archivu nenalezen" @@ -1259,7 +1276,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1279,7 +1296,7 @@ msgstr "" "tar.\n" " %s -xf archiv.tar # Rozbalí v¹echny soubory z archive.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1303,88 +1320,88 @@ msgstr "" " existují, jinak tvoøí jednoduché\n" " never, simple tvoøí v¾dy jednoduché zálo¾ní kopie souborù\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Neoèekávaný konec archivu" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 #, fuzzy msgid "append files to the end of an archive" msgstr "%d bajtù smetí ma konci archivu ignorováno" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1392,559 +1409,572 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Chyba pøi zápise na standardní výstup" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Vícesvazkový archiv není mo¾né ovìøit" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Odporující si archivní formáty" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Odporující si kompresní pøepínaèe" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: soubor je archiv; nearchivován" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Pracovní adresáø nelze zmìnit" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Odstraòuji úvodní `%.*s' z názvù souborù" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "Svazek %s neodpovídá vzorku %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1952,267 +1982,281 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Více jak jeden pøepínaè z `-Acdtrux' nemù¾e být zadán" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Odporující si kompresní pøepínaèe" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " neznámý souborový typ %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Soubor ze kterého se má vzít datum a èas nebyl nalezen" -#: src/tar.c:997 +#: src/tar.c:1017 #, 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:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Neplatný poèet bajtù na záznam" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Upozornìní: pøepínaè -I není podporován; nemysleli jste -j nebo -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Neplatná délka pásky" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Více ne¾ jedeno poèáteèní datum" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Neplatná skupina" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Zadána chybná práva" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Neplatné èíslo i-uzlu" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Neplatný vlastník" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Chybná velikost záznamu" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Velikost záznamu musí být násobek %d." -#: src/tar.c:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "Neplatná délka pásky" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Neznámý vzorek `%s'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Pøepínaè `-[0-7][lmh]' není podporován tímto tarem" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Pøepínaè `%c' vy¾aduje argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Více archivaèních souborù vy¾aduje pøepínaè `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental a --newer nelze kombinovat" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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: Název svazku je pøíli¹ dlouhý (limit je %lu bajtù)" msgstr[1] "%s: Název svazku je pøíli¹ dlouhý (limit je %lu bajtù)" -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Vícesvazkový archiv není mo¾né ovìøit" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Komprimovaný archiv nelze ovìøit" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Vícesvazkový komprimovaný archiv nelze vytvoøit" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Komprimovaný archiv nelze aktualizovat" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Vytvoøení prázdného archivu odmítnuto." -#: src/tar.c:2343 +#: src/tar.c:2389 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:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Musíte zadat jeden z pøepínaèù `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Za bìhu programu nastala chyba" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2221,79 +2265,79 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Soubor zkrácen o bajtù: %s" msgstr[1] "%s: Soubor zkrácen o bajtù: %s" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "Base-64 øetìzec %s je mimo rozsah typu %s" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2456,97 +2500,107 @@ msgstr " msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Neznámá systémová chyba" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "Neznámý vzorek `%s'" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Nelze zavøít" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "Neznámý vzorek `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Nelze zmìnit pozici v souboru na %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Potomek byl ukonèen signálem %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Rozdìlený název souboru--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -3012,6 +3066,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Autoøi: John Gilmore a Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Za bìhu programu nastala chyba" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/da.gmo b/po/da.gmo index 1d68606b00f88de792a40cace02e5010b1c078c5..4bf1a49f8cb7cedd0868eae321a6911b0db99c33 100644 GIT binary patch delta 3280 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\n" "Language-Team: Danish \n" @@ -81,7 +81,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -92,15 +92,15 @@ msgstr "" msgid "Unknown system error" msgstr "Ukendt systemfejl" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -135,7 +135,7 @@ msgstr "%s: flag '%s' kr msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "skrivefejl" @@ -194,16 +194,16 @@ msgstr "%s: flag '-W %s' er flertydigt\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flag '-W %s' tillader ikke et argument\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "hovedlager opbrugt" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Kan ikke ændre arbejdskatalog" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Kan ikke gemme arbejdskatalog" @@ -323,11 +323,23 @@ msgstr "'" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[jJyY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -529,103 +541,103 @@ msgstr "For tidlig filafslutning" msgid "Garbage command" msgstr "Ugyldig kommando" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Dette ligner ikke et tar-arkiv" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Totalt antal byte skrevet: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Totalt antal byte skrevet: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(datakanal)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Ugyldig værdi for record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Arkivnavn er ikke opgivet" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Kan ikke verificere standard-ind/standard-ud arkiver" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Kan ikke opdatere komprimerede arkiver" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Ved begyndelsen af båndet, afslutter nu" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "For mange fejl, afslutter" -#: src/buffer.c:678 -#, fuzzy, 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-justeret blok (%lu byte) i arkiv" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Poststørrelse = %lu blokke" msgstr[1] "Poststørrelse = %lu blokke" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, fuzzy, 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-justeret blok (%lu byte) i arkiv" + +#: src/buffer.c:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: indeholder ugyldigt delarkivs-nummer" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Overløb på delarkiv-nummer" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Filafslutning hvor svar fra bruger var forventet" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ADVARSEL: Arkivet er ufuldstændigt" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -637,69 +649,74 @@ msgstr "" " ! Start en skal\n" " ? Skriv denne list\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Intet nyt delarkiv; afslutter.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "'%s'-kommando mislykkedes" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s fortsætter ikke i dette delarkiv" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsætter ikke i dette delarkiv" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har forkert størrelse (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dette delarkiv kommer ude af rækkefølge" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkivet er ikke navngivet til at passe med %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Volumenet '%s' stemmer ikke overens med %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -711,8 +728,8 @@ msgstr[1] "Kunne kun l msgid "Contents differ" msgstr "Indhold er forskelligt" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Uventet filslutning i arkivet" @@ -829,7 +846,7 @@ msgstr[1] "%s: Filen formindsket med %s byte, fylder ud med nuller" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fil er på et andet filesystem. Ikke lagret" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -858,7 +875,7 @@ msgstr "%s: fil er det samme som arkivet; ikke lagret" msgid "%s: File removed before we read it" msgstr "%s: Fil fjernet før vi læste den" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -909,168 +926,168 @@ msgstr "%s: Katalog omd msgid "Extracting contiguous files as regular files" msgstr "Udtrækker sammenhængende filer som almindelige filer" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Forsøger at udtrække symbolske lænker som hårde lænker" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Læser %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan ikke udtrække -- filen er fortsat fra et tidligere delarkiv" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Uventet filafslutning i ødelagte navne" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Ukendt filtype '%c', udtrukket som en almindelig fil" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Kunne ikke sikkerhedskopiere denne fil" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Kan ikke omdøbe til %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Fejl kan ikke reddes; afslutter nu" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Kataloget er blevet omdøbt" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Kataloget er blevet omdøbt" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Kataloget er nyt" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Ugyldigt tidsstempel" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Ugyldig modus angivet i flag" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Ugyldigt enhedsnummer" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Ugyldigt inode-nummer" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutning i arkivet" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "kan ikke oprette kataloget '%s'" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: fil er på et andet filesystem. Ikke lagret" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" @@ -1090,86 +1107,86 @@ msgstr "blok %s: ** Blok med NUL-er **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Slut på fil **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Arkiv oktal værdi %.*s er udenfor %s område; antager to-komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arkiv oktal værdi %.*s er udenfor %s område" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkiv indeholder forældede base-64 hoveder" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Arkiv base-64 streng med fortegn %s er uden for %s område" -#: src/list.c:794 +#: src/list.c:803 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Arkiv base-256 værdi er uden for %s område" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arkiv værdi %s er udenfor %s område %s..%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " lænke til %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " ukendt filtype %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Volumenhoved--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsætter ved byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Opretter katalog:" @@ -1206,24 +1223,24 @@ msgstr "mellemproces-kanal" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Blev ikke fundet i arkivet" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Blev ikke fundet i arkivet" @@ -1248,7 +1265,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1267,7 +1284,7 @@ msgstr "" " %s -tvf arkiv.tar # List alle filer i arkiv.tar udførligt.\n" " %s -xf arkiv.tar # Udtræk alle filer fra arkiv.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1291,88 +1308,88 @@ msgstr "" " ellers simple\n" " never, simple lav simple sikkerhedskopier\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Uventet filslutning i arkivet" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 #, fuzzy msgid "append files to the end of an archive" msgstr "%d overflødige byte ignoreret ved slutningen på arkiv" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1380,559 +1397,572 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Fejl ved skrivning til standard uddata" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Kan ikke verificere arkiv som går over flere delarkiver" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Konflikt i flagene for arkiv-format" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Konflikt i komprimeringsflag" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: fil er det samme som arkivet; ikke lagret" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Kan ikke ændre arbejdskatalog" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Fjerner indledende '/' fra absolutte lænker" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "Volumenet '%s' stemmer ikke overens med %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1940,268 +1970,282 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Du kan ikke angive mere end et af '-Acdtrux'-flagene" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Konflikt i komprimeringsflag" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " ukendt filtype %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Datofil ikke fundet" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Erstatter %s for ukendt dato-format %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Ugyldig blokfaktor" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Advarsel: -I flaget er ikke understøttet; måske mente du -j eller -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Ugyldig båndlængde" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Mere end én grænse-dato" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: ugyldig gruppe" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Ugyldig modus angivet i flag" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Ugyldigt inode-nummer" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Ugyldig ejer" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Ugyldig poststørrelse" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Poststørrelse skal være deleligt med %d." -#: src/tar.c:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "Ugyldig båndlængde" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Ukendt mønster '%s'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Gammelt flag '%c' behøver et argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Ved flere arkivfiler kræves '-M'-flaget" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Kan ikke kombinere --listed-incremental med --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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: etikette på delarkiv er for lang (grænse er %lu byte)" msgstr[1] "%s: etikette på delarkiv er for lang (grænse er %lu byte)" -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Kan ikke verificere arkiv som går over flere delarkiver" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Kan ikke verificere komprimerede arkiver" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Kan ikke bruge komprimerede arkiver som går over flere delarkiver" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Kan ikke opdatere komprimerede arkiver" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Nægter stædigt at oprette et tomt arkiv" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Flagene '-Aru' er inkompatible med '-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Du skal angive et af '-Acdtrux'-flagene" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Udsat fejl-afslutning som resultat af tidligere fejl" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2210,79 +2254,79 @@ 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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "Arkiv base-64 streng med fortegn %s er uden for %s område" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Arkiv værdi %s er udenfor %s område %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2446,97 +2490,107 @@ msgstr "Inode-nummer uden for omr msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Ukendt systemfejl" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "kan ikke ændre ejer (chown) '%s'" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Kan ikke lukke" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "Ukendt mønster '%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "kan ikke oprette kataloget '%s'" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Underproces døde med signal %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Ødelagte filnavne--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2980,6 +3034,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Skrevet af John Gilmore and Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Udsat fejl-afslutning som resultat af tidligere fejl" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/de.gmo b/po/de.gmo index 9f7bfbf6de1063d971d5534e0a46dba73d980e72..7ac365f3560c7b60ca5f6b2da1b20da626c69106 100644 GIT binary patch delta 9572 zcmbW+d0bW1-pBC`f&(~%q7ZPH1VKgt6&z5(DV)urFhfKo0Tpn#YMwN6%F;TNT9}n) znnNa{rJ3TCL#3%%4rOND%q*`~=A*ZKK3~?p!@tk7U-#$x_gi~fd#$zi;okeq?pil@ z*V;PV(-~n|*3|Bn6@(So2zTRPJdSNJIMcGCF&pD>8mfIAdf;iSjbCCgUP2vzADd%z zmSy$8t{9FB(H}QwSx&13$q^cw;AP}L*021N>tTt!4RxOZ~Po}++~c#zt9KU^mdvHX7si!KN^OjZcvQAI1e4T5_N%H7>QqC z7~aQ*7}m!;Q4%(w?u)v?BiI-xqRxNPZeN8>so!;y=*bSEhVEO`(7HcpIueh%U>530 z2BU_06sm(`QByY)WAJ6vlOMLdiW+jSY-2peQxCyZbj~Bu6Ya)yyn>xExUXeJ;iH&> z3osVZg8 zb5R#8N3D^!Q5QUb8mTj=A^r_@e%%3<6@iUVPn?1pp@&gZH4zigg}To{OyvI7KS&zV z5IWGzNg~#v&O`@hqlUN$>9Ms0^@Pu3JKTsFcm>tr@ImGY(~$LR<)h|$69(X3)cF_C zoBLb8lc;BIgUu5pVH@h^`GcTyT=f7V=rt% z-3m3L?a`?l4J1*|XQKnlQFB&>8tVP14t$H6^Sh`ajChEP;XrJJ({VB`M2*;8R0mrQ zzlI26|J!i`lpbHI!Z>Oh>~} zBbJF8>O$1@7Gg83K#kxwCPzSs&i73ruUEyNXAigezp|A;v*4|Uvh zjK>YAHFFLF@G>^XKT#v$n?t9tEviG)F%FkFNp#?DOvh8$78{N<7w(1{>JrqGy^31R zhfz~=4Ru4WN6i$pLY<$Ay20aE4_Df*L9L0+w$4ftrp9_7vv4=+{dOB=ZWx0PP!C4U z-6Racm+&#HLam|Z6ne7msN;sAI`9PQyRpgkJZg>9&8=BWPHP5<7Y%QsF1!_W!xNZ- z*HPd0(9vd%fY*gJXDyu?#g8=TU2=HjR240#Iw92X@4%*cmHPH@t-r7(CXzU0Ik#Jr>(= ze`^zoZgdWHA@^|%A0}Z>T#UN$DGbBEP&W!4Z&}GW3N-@d7>qkm9Xo5+ZUtt42)3lX zI|kxNbUH|8l61og)DT`mU9bVe;J|p)jR&A^P-a_>;ndqvZ^Jp%BKDfVPdD~JUGGWM z`CDvHVQ=c&6Bz#}l8i$0^I3qJn|Y}A6}Hu=8(%}+(5uL-fq2xDq+<+@K!1E1HAS!4 zbrnWapF~~f9_o7&Q0z3H#5Todt~#S`Ji)dcGpYBWhT46iS)}bSl6okl16eCld#DYvj{U$KNe-!3g@F1&t`0d zA7MOxfu2}rs`+9zz)sY@sE!RnonL@WaT&(p8stHp)+rLr&3)9+M^7_9r-M-=QjYC# zCu&G`a~-Yt1sN`~udYZuW%fP$1U4Em)uSGSt+}!6o=2w#3lcj3D>7 zI+AGU3sG~s8iVktU0=l!)J-{99W2BLaD`o0p}q%~F%^TJ_>b5R{Rht2Rd>b&|-nYSexwN^&q zc$|pp;Fsu!jpi}_T}UG5nGeD^%%FZ3wI*(%P7Hk7%<+8G6l_9f!#an0@*(prs}DYp z>39*tvBd)O`gTIC_PMAvwj4X-z6A_f7|DGaG_+w0%@g%UU9b>Sa3?0>&-f??FEUd! z8+D^qsFB!@ZSfN7dOnNIBJ6^?&m`1aQ*L|ENumq?hLPCn8S{kwP(7ZB$+!%4fkPOA zKiYb;qH0mcqB|yH6eeRk9Er8@MN~&CP-~zX^;S49+YNWI2Mzwunx5xkPwHn;@9XEN z3wk_fJ}4bg7aERja5@Izo2VNev^|b`z*9I1J(ij^HU_)u{eOW(b9M%!vGFoiD?ljU!M`I1fAE2CRcuP#ygVH8S2Wm^GG+-g^J1kf_IVupTbN zSbPB=#C@o#sqZph%4AHWo`_mRucM~s8`Ob%?Ni~h^aB8*3; zCk>-W8e=|s<5cv=xfp?~usI$;b?`ho@Gfd90#=wckc)MxpF>T}a!kSf*aYw381!0c zMsDIt#y^9GEi`EH-N0;2ec611pF&N|BGiqSVH|G7P`reF(ft)O=L0Z+dNKOpI@D|V zAr8e0IMx=crDl?SLUNy#`KkZ$y5OZ(<9!0%={;N#~I-)u@3iY-) zu_1nh0eBYGkz3dTycl@#bJzHFb9@A9O8VG! zE@~~zM-6oaYPD~{B>Vz9q1PK`M0#NZYG*!4eUeht>+&Q9;X-uaTbO}IupQQ0V^(ul zOsAeWB5P2=)3+L#=_$s9(!(unh)oX7pN- z^dSks$*5K7!diF?)#FdG4t|dH@hen^uVF0Szz7W7V!n{wQD4Z}sMWs})qx|Zk-mp9 z==ToeA57By9n+A9Y1B(G3Xh>W_$%_cxBR!7q1%Y+z)6gEr(>v&cvhOJYm0iIY}9L9 zj2f9mI2qTYj`!cr_;(}ewcQN;GdPC&9n=MUtIUC^s2-0&b!ZuCjqF6-;G|vuggMk6 zJ4|~nYLU*uw)hfiB#+@fJmn;rK;qhIPPmWlsr}zGe|il@ov<8rdZ0&8i*qLC=>6YJ5}*_InIUY2>PQz% zz|okFF7(3_n2kT6Hzrq`*D3>>Q$K-$SdN;KZK#ePM@{vwsF4`8pT)@it>;MeB-R1b zkp$EU*{GhDVP9N_UGX?f&FdRs|1oQA~)b+X@X8g4n zmXWl`1*9b>qtzhRu(dFJKx*QIElJd=|B)w&5WB8g;$Iqh<<9 z(VyCNl=0V4ZK0ther)@9jHI@XnbjJFk5T5}DBOd+G4Qw

dc>y%LAuNz?}?;$zdX z;pj^}2V?Lh+x;Ii{%JJ)LW53d{fSvDIq0CCje6qMc6|nQq2DnWy*@QJjz+DSTx^Q- z&E$Kl}?d0?ofPHy&X7 z7-rHw2{nXOsFAsf>Zsp2vxuXy5A`sN#y9Nx6VynzIB(Y0!`NBx|6Gz-c2uJ-cmwq$ zK^M$WJ%k#<`Pdq_VH#dUy#;<3%>~m@9n8aAT#uS6udmD}H~~GWCu0MghHe_ddxW+| z%-_GZxpsa7rxMS(jyfVk63JfXkZk;dc!}K8-JJ6o^^>k9A;E5LuEY?(-qWai+LybD zZX7p;wkhOyiIL=!i0Q;NLfhBGB4Q%(3h_JP<9a^CC-6az*g^H*+xN7cCC0m|LxMx@ zkkz$!FTrNizY^N65S?6Zp}}tXu8>f_2EWv_ntzVDvOxd&L>CD1uBy>N26p()JB8npi^HY@&*MIsT2%Ru3m(yj>TO4Qq^*y>B& z0jH{gEr9w05nxJd9Qm_EA$3E%NIXIOXz$-{E3Ud(uKwZmM(TU=0iplF@-pqqh;_tH zVmzVkW%m7sH}Oy6I5CUpOxr)P3+n&+;U%^HfuZ;VKH#bfk90mxHkcN@zuI!BhZB0O zj^GQ}5u0NPYUAy!*}B=azwJ?4i-{oO9Btc(nMA3*e<1CA<^R3K@sy851m<6-#h+Ns zaY4l2$zw5+=tb-#vhB0Z*{0iuu}_;jvy?=BkI)aGw%+9W4t2&2uCF56I)ANc=Wlvi zz9;Wbco7d09}!!KXV|ChRbn7{GVxPQi}}YJ?%4GhbZ7rN_=kO73^uX%KZUt=4z8uG zJe?lw_xMkn^|5_kd)nHO|76!KaTaYJJXtcnXP@JseH77`dMtLd+oQ>~MHs9V)C-8m zs2{fXHFx82(`fjanCJ?O40CJX>KYlDvY)yI2kphT2~Yb3QtP0d^Q&OJXXmTQhqzWn z26$c~JLTFF=~u9uY!LgiFcY1Geu1_1AYP%~hQUM}v7Y)Zw6G7MZ5+WzyJq{!Zi_%a zqMFtW?BMDY73`Tt7UIf{^6RaG4^izP)|0OwPLn(EF7_m}btg90WIQKrGs$n*^#Lq! zRY&BP^f^&Jt) zo~^{IL@F_Z*hTw398COc8=;)Xih)J0+~{DpDA$~5pOmGvFQsi0G1@+U9_A8n(AEzh zBQ_HEiDtBQbsde4bpC_vIH7F>QO;g%w~7A@F+bn5|3cIyqS)8PKJEkZ^W=dTXt(`9 zKAF(=8g2J+jlHj?k$>t__cC7{{z9}{FJK${z=c@L&g;_tG-I`v=YEfPmb|rnjt;rc zwzKm6m;-*5Yr9AIR$d*J=iMbgZ-Qe?{?vlJd`Iz=qS5&!rH*Oi^NSsMCHc8!1;yhW z1;wOA`Nd_qg^t{kyzvE7^Gh93WAex5PAM#FUD+#dntQvv@&B*ORPM|l?dz803Y?MA zFfl1MshuMsAuTyMCLzf+VMc&ga%^IXBQYf{IiYgdjFW+t6)P(ID|0HhH|WqazvRH$ zvV1yRlwaZ)onPR{Dk&|?FD#r=)8PrG!_@5UYWnP$RC3^hv981uzLkxu_qoUXA1>iq NTJBeQ^1$wv{|lPevw{Es delta 9525 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, 1995? # Karl Eichwalder , 1996 @@ -7,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: tar 1.19.90\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2008-02-11 11:03+0100\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-04-15 15:40+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -83,7 +84,7 @@ msgstr " [OPTION...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "„%s --help“ oder „%s --usage“ gibt weitere Informationen.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an %s.\n" @@ -92,15 +93,15 @@ msgstr "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an %s.\n" msgid "Unknown system error" msgstr "Unbekannter Systemfehler." -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "diese Hilfe ausgeben" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "eine kurze Benutzungsübersicht ausgeben" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NAME" @@ -113,11 +114,11 @@ msgstr "den Programmnamen setzen" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "für SEK Sekunden hängenbleiben (Voreinst.: 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "Programmversion ausgeben" @@ -135,7 +136,7 @@ msgstr "%s: Zu viele Argumente\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(PROGRAMMFEHLER) Option hätte erkannt werden müssen!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "Schreibfehler" @@ -194,16 +195,16 @@ msgstr "%s: Option „-W %s“ ist mehrdeutig.\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: Option „-W %s“ erlaubt keinen Parameter.\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "Kein Speicher mehr" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "Kann Arbeitsverzeichnis nicht aufzeichnen." -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "Konnde nicht zu ursprünglichem Arbeitsverzeichnis zurückkehren." @@ -322,11 +323,23 @@ msgstr "„" msgid "'" msgstr "“" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[yYjJ]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -551,102 +564,102 @@ msgstr "Vorzeitiges Dateiende." msgid "Garbage command" msgstr "Ungültiges Kommando." -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Das sieht nicht wie ein „tar“-Archiv aus." -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Gesamtzahl geschriebener Bytes" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Gesamtzahl gelesener Bytes" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Gesamtzahl gelöschter Bytes: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Ungültiger Wert für „record_size“." -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Kein Archivname angegeben" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Kann Archive auf Standard-Ein-/Ausgabe nicht prüfen." -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archiv ist komprimiert. Benutzen Sie die Option %s." -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Kann komprimierte Archive nicht aktualisieren" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Am Anfang des Mediums, beende jetzt." -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Zu viele Fehler, beende." -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "„rmtlseek“ nicht an Recordgrenze angehalten" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: enthält ungültige Teil-Nummer." -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Teil-Nummer zu groß." -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Dateiende gefunden, Benutzereingabe erwartet" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "WARNUNG: Archiv unvollständig" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -658,66 +671,67 @@ msgstr "" " q „tar“ abbrechen\n" " j oder Enter fortfahren\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Shell in einem Unterprozess starten\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? diese Liste ausgeben\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Kein neues Medium; halte an.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Dateiname nicht angegeben. Versuchen Sie es noch einmal.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ungültige Eingabe. Geben Sie „?“ für Hilfe ein.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "„%s“-Kommando gescheitert." -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "Dieser Teil ist keine Fortsetzung von %s." -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s hat die falsche Größe (%s != %s + %s)." -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dieser Teil ist nicht an der Reihe." -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Kennzeichnung des Archivs passt nicht zu „%s“." -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Teil „%s“ passt nicht zu „%s“." -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -725,6 +739,11 @@ msgstr "" "%s: Dateiname zu lang, um in einem GNU-Mehrteil-Kopf abgelegt werden zu " "können, abgeschnitten" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "„rmtlseek“ nicht an Recordgrenze angehalten" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -736,8 +755,8 @@ msgstr[1] "Konnte nur %lu von %lu Bytes lesen" msgid "Contents differ" msgstr "Unterschiedliche Inhalte" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Unerwartetes Dateiende im Archiv." @@ -855,7 +874,7 @@ msgstr[1] "Datei %s ist um %s Bytes geschrumpft, fülle mit Nullen auf." msgid "%s: file is on a different filesystem; not dumped" msgstr "Datei %s liegt auf einem anderen Dateisystem; nicht gesichert." -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "Inhalt nicht gesichert" @@ -884,7 +903,7 @@ msgstr "%s ist das Archiv; nicht gesichert." msgid "%s: File removed before we read it" msgstr "%s: Datei gelöscht, bevor sie gelesen wurde." -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "Verzeichnis nicht gesichert" @@ -935,168 +954,168 @@ msgstr "%s: Verzeichnis umbenannt bevor sein Status ermittelt werden konnte" msgid "Extracting contiguous files as regular files" msgstr "Extrahiere zusammenhängende Dateien („contiguous files“) als reguläre." -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Versuche symbolische Links als harte Links herauszuholen." -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Lese %s.\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "Kann „%s“ nicht herausholen -- Datei ist Fortsetzung eines anderen Teils." -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Unerwarteter Kopfteil mit langem Namen" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Unbekannter Dateityp „%c“, wie normale Datei extrahiert." -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Aktuelles %s ist neuer oder hat dasselbe Alter." -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Konnte keine Sicherheitskopie von dieser Datei erstellen" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Kann %s nicht in %s umbenennen." -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Nicht behebbarer Fehler: Programmabbruch. " -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Verzeichnis wurde von „%s“ umbenannt." -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Verzeichnis wurde umbenannt." -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "Verzeichnis „%s“ ist neu." -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Ungültiges Datum" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Ungültige Änderungszeit (Sekunden)." -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Ungültige Änderungszeit (Nanosekunden)." -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Ungültige Gerätenummer" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Ungültige Inode-Nummer" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Feld zu lang beim Lesen der Schnappschussdatei" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Lesefehler in Schnappschussdatei" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Unerwartetes Dateiende im Schnappschussdatei." -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Unerwarteter Feldwert in Schnappschussdatei" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Fehlender Record-Abschluss" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "unzulässiges inkrementelles Dateiformat" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nicht unterstützte Version des inkrementellen Formats: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Fehlgeformtes Verzeichnis für Dump: „%c“ erwartet, aber %#3o gefunden" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ dupliziert" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „R“" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: „T“ folgt nicht „R“" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „T“" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ nie benutzt" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kann kein temporäres Verzeichnis mit der Schablone %s anlegen" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Entferne Verzeichnis nicht: kann nicht zugreifen" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Lösche %s.\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kann nicht entfernen." @@ -1116,71 +1135,71 @@ msgstr "Block %s: ** Block aus NULlen **\n" msgid "block %s: ** End of File **\n" msgstr "Block %s: ** Ende der Datei **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "Block %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Leerzeichen im Kopfteil, wo nummerische %s-Werte stehen sollten." #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiv enthält veraltete Base64-Kopfteile" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " Verküpfung zu %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " unbekannter Dateityp %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "––Lange Verknüpfung––\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "––Langer Name––\n" @@ -1188,17 +1207,17 @@ 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:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "––Vorspann des Teils––\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "––Fortgesetzt bei Byte %s––\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Erzeuge Verzeichnis:" @@ -1235,24 +1254,24 @@ msgstr "interprocess channel" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Zeichen für Musterüberdeckung im Dateinamen benutzt. Benutzen" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "Sie bitte --wildcards, um Musterüberdeckung zu ermöglichen oder" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "--no-wildcards, um diese Warnung zu unterdrücken." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nicht im Archiv gefunden." -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Erforderliches Auftreten nicht im Archiv gefunden." @@ -1279,7 +1298,7 @@ msgstr "" "Unbekannter Zitatstil „%s“. Versuchen Sie „%s --quoting-style=help“ für eine " "Liste." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1298,7 +1317,7 @@ msgstr "" " %s -tvf archiv.tar # Inhalt von archiv.tar ausführlich anzeigen\n" " %s -xf archiv.tar # alle Dateien aus archiv.tar extrahieren\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1322,86 +1341,86 @@ msgstr "" " vorhanden sind, sonst einfache\n" " never, simple immer einfache Sicherheitskopien\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Hauptsächlicher Arbeitsmodus:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "den Inhalt eines Archivs auflisten" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "Dateien aus einem Archiv extrahieren" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "ein neues Archiv anlegen" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "Unterschiede zwischen Archiv und Dateisystem suchen" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "Dateien hinten an das Archiv anfügen" -#: src/tar.c:384 +#: src/tar.c:386 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:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "tar-Dateien an ein Archiv anfügen" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "aus dem Archiv löschen (nicht auf Magnetband!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "den Archiv-Teil-Namen überprüfen und beenden" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Feineinstellungen:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "löchrige Dateien („sparse files“) effizient behandeln" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "zu benutzende Version des Sparse-Formats setzen (impliziert --sparse)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "inkrementelle Sicherung im alten GNU-Format" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "DATEI" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "inkrementelle Sicherung im neuen GNU-Format" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "kein Abbruch mit Existatus!=0 bei unlesbaren Dateien" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "ZAHL" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1413,121 +1432,122 @@ 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:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "im Archiv kann positioniert werden" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "Gerätenummer bei Erstellung inkrementeller Archive nicht prüfen" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" +"Gerätenummer bei Erstellung inkrementeller Archive prüfen (Voreinstellung)" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Steuerung des Überschreibens:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "Archiv nach dem Schreiben prüfen" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "Dateien nach dem Hinzufügen zum Archiv löschen" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "vorhandene Dateien beim Extrahieren nicht überschreiben" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "vorhandene Dateien beim Extrahieren überschreiben" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "zu überschreibende Dateien vor dem Extrahieren löschen" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" "Verzeichnishierarchien rekursiv vor dem Extrahieren eines Verzeichnisses " "löschen" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "Metadaten existierender Verzeichnisse erhalten" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "Metadaten existierender Verzeichnisse beim Extrahieren überschreiben " "(Voreinstellung)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Wahl des Ausgabestroms:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "Dateien auf die Standardausgabe extrahieren" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "BEFEHL" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "extrahierte Dateien an ein anderes Programm weiterreichen" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "Exitstatus der Kinder ignorieren" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "Exitstatus!=0 von Kindern als Fehler ansehen" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Behandlung der Datei-Attribute:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "Eigentümer für hinzugefügte Dateien auf NAME setzen" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "Gruppe für hinzugefügte Dateien auf NAME setzen" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATUM-ODER-DATEI" -#: src/tar.c:472 +#: src/tar.c:474 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:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "ÄNDERUNGEN" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "den (symbolischen) Modus ÄNDERUNGEN für hinzugefügte Dateien erzwingen" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "METHODE" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1538,30 +1558,30 @@ msgstr "" "oder dadurch, dass die Zeiten gar nicht erst neu gesetzt werden (METHODE=" "„system“)" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "die geänderte Zeit nicht extrahieren" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" "versuchen, die Dateien mit denselben Eigentumsverhältnisse zu extrahieren" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "Dateien als aktueller Nutzer extrahieren" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "immer Zahlen für Nutzer-/Gruppennamen verwenden" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "Informationen über Dateizugriffsrechte mit extrahieren (Voreinstellung für " "Root)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1569,15 +1589,15 @@ msgstr "" "die Umask des Nutzers anwenden beim Extrahieren von Dateizugriffsrechte aus " "dem Archiv (Voreinstellung für normale Nutzer)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "zu entpackende Dateinamen wie im Archiv sortieren" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "wie -p und -s zusammen" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1585,139 +1605,139 @@ msgstr "" "das Setzen von Zugriffszeiten und Rechten von extrahierten Verzeichnissen " "verschieben bis zum Ende des Entpackens" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "den Effekt von --delay-directory-restore aufheben" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Geräteauswahl und -umschaltung:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHIV" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "Archivdatei oder Gerät ARCHIV benutzen" -#: src/tar.c:513 +#: src/tar.c:515 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:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "statt „rmt“ den gegebenen BEFEHL benutzen" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "statt „rsh“ den entfernten BEFEHL benutzen" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "Laufwerk und Schreibdichte angeben" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "mehrteiliges Archiv anlegen/listen/extrahieren" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Medium wechseln, wenn ZAHL × 1024 Bytes geschrieben wurden" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "am Ende jedes Mediums das Skript ausführen (impliziert -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "Teil-Nummer in DATEI benutzen/aktualisieren" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Blockung des Gerätes:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLÖCKE" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLÖCKE × 512 Bytes pro Record" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ZAHL Bytes pro Record, Vielfaches von 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Blöcke mit Nullen im Archiv ignorieren (heißt EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "erneut Blocken beim Lesen (für 4.2BSD‐Pipes)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Auswahl des Archiv-Formats:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "Archiv mit dem gegebenen Format anlegen" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMAT ist eines der folgenden:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "altes V7-tar-Format" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "GNU-Format wie mit tar <=1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU-tar-1.13.x-Format" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Format von POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Format von POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "wie pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "wie --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "wie --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "Schlüsselwort[[:]=Wert][,Schlüsselwort[[:]=Wert]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "Pax-Schlüsselwörter steuern" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1725,86 +1745,100 @@ msgstr "" "Archiv mit dem Teilnamen TEXT anlegen; beim Listen/Extrahieren, TEXT als " "Muster für den Teilnamen benutzen" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Kompressionsoptionen:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "Archiverweiterung nehmen, um Kompressionsprogramm zu bestimmen" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "Archiverweiterung nehmen, um Kompressionsprogramm zu bestimmen" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "Archiv durch bzip2 filtern" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "Archiv durch gzip filtern" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "Archiv durch compress filtern" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "Archiv durch lzma filtern" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "Archiv durch gzip filtern" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "durch PROG filten (muss -d akzeptieren)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Auswahl der lokalen Dateien:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "VERZEICHNIS" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "zu VERZEICHNIS wechseln" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "Namen der zu bearbeitenden Dateien aus DATEI lesen" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T liest null-terminierte Namen, verbiete -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" "Dateinamen, die mit -T gelesen werden, von Zitat befreien (Voreinstellung)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "Dateinamen, die mit -T gelesen werden, nicht von Zitat befreien" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "MUSTER" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "Dateien auslassen, auf die MUSTER passt" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "Dateien auslassen, auf die in DATEI angegebene Muster passen" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1812,93 +1846,93 @@ msgstr "" "Inhalt von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten, außer der " "Markierungsdatei selbst" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" "alles unterhalb von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Verzeichnisse auslassen, die CACHEDIR.TAG enthalten" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "alles unterhalb von Verzeichnissen auslassen, die DATEI enthalten" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "Verzeichnisse auslassen, die DATEI enthalten" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "Verzeichnisse von Versionskontrollsystemen auslassen" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "automatischen Abstieg in Vezeichnisse vermeiden" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "beim Anlegen eines Archivs im lokalen Dateisystem bleiben" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "in Verzeichnisse absteigen (Voreinstellung)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "führende „/“-Zeichen in den Dateinamen erhalten" -#: src/tar.c:656 +#: src/tar.c:665 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:658 +#: src/tar.c:667 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "ELEMENT-NAME" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "mit ELEMENT-NAME im Archiv beginnen" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "nur Dateien ablegen, die neuer als DATUM-ODER-DATEI sind" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATUM" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "Datum und Zeit nur überprüfen, wenn Daten geändert wurden" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "KONTROLLE" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "Sicherung vor dem Entfernen, wähle Versions-KONTROLLE" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "ZEICHENKETTE" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1906,90 +1940,90 @@ msgstr "" "Sicherung vor dem Entfernen, übliches Suffix ersetzen („~“, wenn nicht durch " "Umgebungsvariable SIMPLE_BACKUP_SUFFIX anders gesetzt)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Dateinamentransformationen:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "ZAHL führende Komponenten beim Extrahieren von Dateinamen entfernen" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "AUSDRUCK" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "den sed-AUSDRUCK zur Dateinamentransformation benutzen" -#: src/tar.c:684 +#: src/tar.c:694 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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "Groß-/Kleinschreibung ignorieren" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "Muster am Dateinamensanfang ausrichten" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "Muster passen nach jedem „/“ (Voreinstellung beim Ausschluss)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "Groß-/Kleinschreibung beachten (Voreinstellung)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "Muster benutzen (Voreinstellung für Ausschluss)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "Zeichenketten sind buchstabengetreu" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "Jokerzeichen passen nicht auf „/“" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "Jokerzeichen passen auf „/“ (Voreinstellung für Ausschluss)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Informationen:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "bearbeitete Dateien ausführlich listen" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Fortschrittsnachrichten bei jedem ZAHLten Record (Voreinstellung 10) anzeigen" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "AKTION" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "AKTION bei jedem Kontrollpunkt ausführen" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" "eine Nachricht ausgeben, wenn nicht alle Verknüpfungen abgespeichert werden" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2001,27 +2035,27 @@ msgstr "" "wird; erlaubte Signale sind: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 und SIGUSR2; " "die Namen ohne das Präfix SIG sind auch erlaubt" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "Dateiänderungszeiten in UTC anzeigen" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "ausführliche Ausgabe in DATEI schreiben" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "bei jeder Nachricht die Blocknummer innerhalb des Archivs mit anzeigen" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "für jede Aktion um Bestätigung bitten" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "Voreinstellungen von tar anzeigen" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2029,86 +2063,86 @@ msgstr "" "beim Listen oder Extrahieren jedes Verzeichnis auflisten, dass nicht den " "Suchkriterien entspricht" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "Datei- oder Archivnamen nach der Transformation anzeigen" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STIL" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "zusätzliche Zeichen aus ZEICHENKETTE zitieren" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "Zeichen aus ZEICHENKETTE nicht zitieren" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Kompatibilitätsoptionen:" -#: src/tar.c:753 +#: src/tar.c:763 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:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Weitere Optionen:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "möglicherweise schädliche Optionen deaktivieren" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Von den Optionen „-Acdtrux“ ist nur _eine_ erlaubt." -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Kompressionsoptionen schließen sich gegenseitig aus." -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Unbekannter Signalname: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Datumsdatei nicht gefunden" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Ersetze %s für unbekanntes Datumsformat %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Option %s: Behandle Datum „%s“ als %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: Dateiliste schon gelesen" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: gelesener Dateiname enthält ein NULL-Zeichen" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Gültige Argumente für die Option --quoting-style sind:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2116,153 +2150,166 @@ msgstr "" "\n" "*Dieses* „tar“ hat als Voreinstellung:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Ungültige Blockgröße" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Warnung: Die Option -I ist nicht unterstützt, meinen Sie -j oder -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Ungültige Bandlänge" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Mehr als ein Datum angegeben." -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Ungültiger Wert für Sparse-Version" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' wird auf dieser Plattform nicht unterstützt" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "Wert für --checkpoint ist keine ganze Zahl" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Ungültige Gruppe" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Ungültige Zugriffsrechte angegeben." -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Ungültige Zahl" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Ungültiger Benutzer" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Ungültiger Wert für Recordgröße." -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Die Recordgröße muss ein Vielfaches von %d sein." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Ungültige Elementanzahl" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Nur eine Option --to-command erlaubt" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Fehlgeformtes Dichteargument: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Unbekannte Dicht: „%c“" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[DATEI]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Die alte Option „%c“ benötigt einen Parameter." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ist ohne Dateiliste bedeutungslos" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" "--occurrence kann im angeforderten Operationsmodus nicht benutzt werden" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Mehrere Archivdateien verlangen die Option „-M“." -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental kann nicht mit --newer benutzt werden" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Kann mehrteilige Archive nicht prüfen." -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Kann komprimierte Archive nicht prüfen" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Kann keine mehrteiligen komprimierten Archive verwenden." -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Kann komprimierte Archive nicht aneinanderhängen" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option kann nur mit POSIX-Archiven benutzt werden" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Anlegen eines leeren Archivs wird feige verweigert." -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Die Optionen „-Aru“ sind nicht kompatibel mit „-f -“." -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Eine der Optionen „-Acdtrux“ ist notwendig." -# Was ist hier genau gemeint? ke -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Fehler beim Beenden, verursacht durch vorhergehende Fehler." +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2271,52 +2318,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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Schlüsselwort %s ist unbekannt oder noch nicht implementiert" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Muster %s kann nicht benutzt werden" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Schlüsselwort %s kann nicht überschrieben werden" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Fehlgeformter erweiterter Kopfteil: fehlende Länge" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Länge des erweiterten Kopfteils ist außerhalb des erlaubten Bereichs" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Fehlgeformter erweiterter Kopfteil: fehlender Leerraum nach der Länge" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Fehlgeformter erweiterter Kopfteil: fehlendes Gleichheitszeichen" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Fehlgeformter erweiterter Kopfteil: fehlender Zeilenvorschub" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Ignoriere unbekanntes Schlüsselwort „%s“ für erweiterten Kopfteil" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2324,29 +2371,29 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Fehlgeformter erweiterter Kopfteil: ungültiges %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Fehlgeformter erweiterter Kopfteil: überzähliges %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, 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:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2526,102 +2573,120 @@ msgstr "Zahl außerhalb des zulässigen Bereichs: %s" msgid "Negative size: %s" msgstr "Negative Größe: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) fehlgeschlagen" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Fehler beim Parser der Zahl in der Nähe von „%s“" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGUMENTE...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "kann „%s“ nicht öffnen" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "kann nicht positionieren" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "Dateiname enthält Null-Zeichen" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "kann auf der Standardausgabe keine löchrige Datei erstellen, benutzen Sie " "die Option --file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "inkorrekte Maske (nahe „%s“)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "unbekannte Feld „%s“" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "kann an „%s“ keine Zeit setzen" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Befehl erfolgreich ausgeführt\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Befehl schlug mit Beendigungsstatus %d fehl.\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Befehl beendete sich bei Signal %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Befehl hieltb bei Signal %d an\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Befehl erzeugte einen Core-Dump\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Befehl beendet\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat erfordert Dateinamen" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "zu viele Argumente" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "den Effekt von --delay-directory-restore aufheben" + +# Was ist hier genau gemeint? ke +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Fehler beim Beenden, verursacht durch vorhergehende Fehler." + #~ msgid "[.]NUMBER" #~ msgstr "[.]ZAHL" diff --git a/po/el.gmo b/po/el.gmo index 5501f19b41ba2566d7a4c72b55c95d2397672a73..54e2810886f84775718fa8fa96340d5ffc363786 100644 GIT binary patch delta 3175 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 diff --git a/po/el.po b/po/el.po index e9e53f0..7422af6 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25 \n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2004-03-08 14:44+0200\n" "Last-Translator: Μπαλάσκας Ευάγγελος (Balaskas Euaggelos) \n" @@ -83,7 +83,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Προσπαθήστε `%s --help' για περισσότερες πληροφορίες.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -94,15 +94,15 @@ msgstr "" msgid "Unknown system error" msgstr "Άγνωστο σφάλμα συστήματος" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -115,11 +115,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -137,7 +137,7 @@ msgstr "%s: η επιλογή `%s' απαιτεί όρισμα\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -196,16 +196,16 @@ msgstr "%s: η επιλογή `-W %s' είναι αμφιλεγόμενη\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: η επιλογή `-W %s' δεν επιτρέπει όρισμα\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "η μνήμη εξαντλήθηκε" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Δεν είναι δυνατή η τροποποίηση του τρέχοντος καταλόγου" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Δεν είναι δυνατή η αποθήκευση του τρέχοντος καταλόγου" @@ -327,11 +327,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -540,104 +552,104 @@ msgstr "Πρόωρο τέλος αρχείου" msgid "Garbage command" msgstr "Εντολή απορριμμάτων" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Αυτό δεν φαίνεται ως αρχειοθήκη tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Συνολικά byte που γράφτηκαν: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Συνολικά byte που γράφτηκαν: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(σωλήνωση)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Άκυρη τιμή για record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Δεν δόθηκε όνομα αρχειοθήκης" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "" "Δεν είναι δυνατή η επαλήθευση των κανονικών εισόδων/εξόδων της αρχειοθήκης" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αρχειοθηκών" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Στην αρχή της ταινίας, τερματισμός τώρα" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Πάρα πολλά σφάλματα, τερματισμός" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: περιέχει άκυρο αριθμό τόμου" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Υπερχήλιση αριθμού τόμου" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Προετοίμασε τον τόμο #%d για %s και πάτα το πλήκτρο επιστροφής γραμμής" -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF (Τέλος Αρχείου) ενώ η απάντηση του χρήστη αναμενότανε" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ΠΡΟΕΙΔΟΠΟΊΗΣΗ: Η αρχειοθήκη είναι ημιτελής" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -649,69 +661,74 @@ msgstr "" " ! Παραγωγή νέου υπό-φλοιού\n" " ? Εκτύπωση αυτής της λίστας\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Κανένας νέος τόμος; έξοδος\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "`%s' η εντολή απέτυχε" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s είναι το εσφαλμένο μέγεθος (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Αυτός ο τόμος είναι εκτός συνέχειας" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Η αρχειοθήκη δεν έχει ετικέτα για ταίριασμα %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Ο τόμος %s δεν ταιριάζει %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -723,8 +740,8 @@ msgstr[1] "Δυνατή μόνο η ανάγνωση %lu από %lu byte" msgid "Contents differ" msgstr "Τα περιεχόμενα διαφέρουν" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" @@ -841,7 +858,7 @@ msgstr[1] "%s: Το αρχείο συρρικνώθηκε σε %s bytes; συμ msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: το αρχείο είναι σε διαφορετικό σύστημα αρχείων; δεν αποθηκεύτηκε" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -870,7 +887,7 @@ msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν απο msgid "%s: File removed before we read it" msgstr "%s: Το αρχείο απομακρύνθηκε πριν το διαβάσουμε" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -921,168 +938,168 @@ msgstr "%s: Ο κατάλογος μετονομάστηκε πριν η κατ msgid "Extracting contiguous files as regular files" msgstr "Εξαγωγή συνεχόμενων αρχείων ως κανονικών αρχείων" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Προσπάθεια εξαγωγής των συμβολικών συνδέσμων ως σθεναρών συνδέσμων" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Ανάγνωση %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Δεν είναι δυνατή η εξαγωγή -- το αρχείο συνεχίζεται σε άλλο τόμο" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στα κατακερματισμένα ονόματα" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Άγνωστος τύπος αρχείου '%c', εξαγωγή ως κανονικό αρχείο" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Δεν είναι δυνατή η αποθήκευση αυτού του αρχείου" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Το σφάλμα δεν είναι επανορθώσιμο: τερματισμός τώρα" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Ο κατάλογος έχει μετονομαστεί" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Ο κατάλογος έχει μετονομαστεί" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Ο κατάλογος είναι καινούριος" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Άκυρη ένδειξη χρόνου" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Άκυρη κατάσταση δόθηκε σε επιλογή" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Άκυρος αριθμός συσκευής" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Άκυρος αριθμός i-κόμβου" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Δεν είναι δυνατή η δέσμευση μνήμης για τον συντελεστή ομαδοποίησης %d" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: το αρχείο είναι σε διαφορετικό σύστημα αρχείων; δεν αποθηκεύτηκε" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Διαγραφή %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Δεν είναι δυνατή η απομάκρυνση" @@ -1102,19 +1119,19 @@ msgstr "μπλοκ %s: ** Μπλοκ με χαρακτήρες NUL **\n" msgid "block %s: ** End of File **\n" msgstr "μπλοκ %s: ** Τέλος Αρχείου **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "μπλοκ %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1122,70 +1139,70 @@ msgstr "" "συμπληρώματα" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Αρχειοθήκη οκταδικής τιμής %.*s είναι εκτός του %s εύρους" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Η αρχειοθήκη περιέχει απαρχαιωμένες επικεφαλίδες κωδικοποίησης base64" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Η αρχειοθήκη είναι υπογεγραμμένη με αλφαριθμητικά base-64 %s είναι εκτός του " "%s εύρους" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Η τιμή της αρχειοθήκης %s είναι εκτός του %s εύρους %s..%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " σύνδεσμος σε %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " άγνωστος τύπος αρχείου %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Επικεφαλίδα Τόμου--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Συνέχιση στο byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Δημιουργία καταλόγου:" @@ -1222,24 +1239,24 @@ msgstr "κανάλι μεταξύ διεργασιών" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Δεν βρέθηκε στην αρχειοθήκη" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Δεν βρέθηκε στην αρχειοθήκη" @@ -1264,7 +1281,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1285,7 +1302,7 @@ msgstr "" "archive.tar με λεπτομέρειες.\n" " %s -xf archive.tar # Εξάγει όλα τα αρχεία από το archive.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1308,87 +1325,87 @@ msgstr "" "διαφορετικά\n" " never, simple πάντα κάνε απλά αντίγραφα\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1396,559 +1413,572 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Σφάλμα κατά την εγγραφή στην κανονική έξοδο" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Δεν είναι δυνατή η επαλήθευση πολλαπλών αρχειοθηκών" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Συγκρουόμενες επιλογές διαμόρφωσης αρχειοθήκης" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Συγκρουόμενες επιλογές συμπίεσης" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Δεν είναι δυνατή η τροποποίηση του τρέχοντος καταλόγου" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Απομακρύνονται τα αρχικά `%.*s' από τα ονόματα των μελών" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "Ο τόμος %s δεν ταιριάζει %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1956,270 +1986,284 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Ίσως δεν καθορίσατε παραπάνω από μία επιλογή `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Συγκρουόμενες επιλογές συμπίεσης" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " άγνωστος τύπος αρχείου %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Το αρχείο ημερομηνίας δεν βρέθηκε" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Αντικατάσταση %s για άγνωστη διαμόρφωση ημερομηνίας %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Άκυρος συντελεστής ομαδοποίησης" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" "Προειδοποίηση: η -I επιλογή δεν υποστηρίζεται; ίσως εννοούσατε την -j ή την -" "T;" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Άκυρο μέγεθος ταινίας" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Παραπάνω από ένα όριο ημερομηνίας" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Άκυρη ομάδα" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Άκυρη κατάσταση δόθηκε σε επιλογή" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Άκυρος αριθμός i-κόμβου" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Άκυρος ιδιοκτήτης" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Άκυρο μέγεθος εγγραφής" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Το μέγεθος της εγγραφής πρέπει να είναι πολλαπλάσιο του %d." -#: src/tar.c:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "Άκυρο μέγεθος ταινίας" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "" "Οι επιλογές `-[0-7][lmh]' δεν υποστηρίζονται από *αυτήν* την εντολή tar" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Παλιά επιλογή `%c' απαιτεί όρισμα." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Πολλαπλά αρχεία αρχειοθηκών απαιτούν την επιλογή `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Δεν είναι δυνατός ο συνδυασμός --listed-incremental με --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Δεν είναι δυνατή η επαλήθευση πολλαπλών αρχειοθηκών" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Δεν είναι δυνατή η επαλήθευση των συμπιεσμένων αρχειοθηκών" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Δεν είναι δυνατή η χρήση πολλαπλών συμπιεσμένων αρχειοθηκών" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αρχειοθηκών" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Αρνούμαι δειλά στη δημιουργία μίας κενής αρχειοθήκης" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Οι επιλογές `-Aru' δεν είναι συμβατές με `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Πρέπει να καθορίσεις μία από τις επιλογές `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Καθυστέρησε το σφάλμα εξόδου από προηγούμενα σφάλματα" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2228,81 +2272,81 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Το αρχείο συρρικνώθηκε κάτα %s byte" msgstr[1] "%s: Το αρχείο συρρικνώθηκε κάτα %s byte" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "" "Η αρχειοθήκη είναι υπογεγραμμένη με αλφαριθμητικά base-64 %s είναι εκτός του " "%s εύρους" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Η τιμή της αρχειοθήκης %s είναι εκτός του %s εύρους %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2465,97 +2509,107 @@ msgstr "Ο αριθμός του i-κόμβου είναι εκτός εύρου msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Άγνωστο σφάλμα συστήματος" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Δεν είναι δυνατό το κλείσιμο" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " άγνωστος τύπος αρχείου %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Η θυγατρική διεργασία τερματίστηκε με το σήμα %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Κατακερματισμένα ονόματα αρχείων--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -3031,6 +3085,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Γράφτηκε από τους John Gilmore και Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Καθυστέρησε το σφάλμα εξόδου από προηγούμενα σφάλματα" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/es.gmo b/po/es.gmo index 39d43861ba27baf1587fa600df990a6a810d6352..5284df9e08d031bb05dd912bd26bb78fdf1b9246 100644 GIT binary patch delta 6354 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 delta 6569 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%0A`&9ji2z2fKXI(*TCiD+TbE1OK^$+4c;!EOl zqA496!FpJUSBYW7N}>*JGw=nXH_@8<34D&YMEw04OQnU~1^cbnk59Qfb~>-eU}6aI zB=IJp%cJA>Fp;RO1}-1bjwm7a5xP2+PiizHJk~d}aGICzo0vDtm+uvn6i@P|l=!9> z7MGQJzLJvSlG5_y32z5A9bZ`LO)s8UHp%BvDlVJm6&HA=zNuxt$z#hGcg(0;H@S0% zl+IpCm+r}FiOH$u$I_2PbsCg6u`oZ+8(TctcE&)Hic9in%J-G#`)s4H)XSSZ%~w)b rT;eM&-#GBe;J7}e(|m3?o-Cbq$}1@ImFOwP9IG)4^U8BZj;r@4B1ini diff --git a/po/es.po b/po/es.po index 2677be2..52d1cd6 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.15.1\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2004-12-27 20:45+0100\n" "Last-Translator: Santiago Vila Doncel \n" "Language-Team: Spanish \n" @@ -99,7 +99,7 @@ msgstr "Pruebe `%s --help' o `%s --usage' para m # ¿No tendría sentido catalogarlos entonces? # # Véase "A Bug's life". -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Comunicar bichos a %s.\n" @@ -108,17 +108,17 @@ msgstr "Comunicar bichos a %s.\n" msgid "Unknown system error" msgstr "Error del sistema desconocido" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 #, fuzzy msgid "give this help list" msgstr "Da esta lista de ayuda" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 #, fuzzy msgid "give a short usage message" msgstr "Da un mensaje de uso corto" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NOMBRE" @@ -131,11 +131,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 #, fuzzy msgid "print program version" msgstr "Muestra la versión del programa" @@ -154,7 +154,7 @@ msgstr "%s: la opci msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -213,16 +213,16 @@ msgstr "%s: la opci msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: la opción `-W %s' no admite ningún argumento\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "memoria agotada" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "No se pudo obtener el directorio actual" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "No se puede determinar el directorio de trabajo inicial" @@ -344,11 +344,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -567,8 +579,8 @@ msgstr "Fin de fichero prematuro" msgid "Garbage command" msgstr "Orden ininteligible" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Esto no parece un archivo tar" @@ -577,12 +589,12 @@ msgstr "Esto no parece un archivo tar" # "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:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Bytes escritos en total: %s (%s, %s/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" @@ -591,7 +603,7 @@ msgstr "" # "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:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Bytes escritos en total: %s (%s, %s/s)\n" @@ -610,17 +622,17 @@ msgstr "Bytes escritos en total: %s (%s, %s/s)\n" # 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:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(tubería)" # ¿No queda más bonita la 1ª comilla abierta así: `record_size'? # Sí. FIXME. Comunicar al autor. sv -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "El valor de `record_size' no es válido" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "No se ha especificado ningún nombre de archivo" @@ -639,69 +651,69 @@ msgstr "No se ha especificado ning # 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:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "No se puede verificar la entrada/salida estándar" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "El archivo está comprimido. Utilice la opción %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "No se pueden actualizar archivos comprimidos" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Al principio de la cinta, se terminará ahora" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Demasiados errores, abandono" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, 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:793 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" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek no paró en los límites de un registro" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contiene un número de volumen inválido" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Desbordamiento en el número de volumen" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare el volumen #%d para %s y pulse intro: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "" "Se encontró un final de fichero mientras se esperaba respuesta del usuario" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ATENCIÓN: El archivo está incompleto" @@ -733,7 +745,7 @@ msgstr "ATENCI # 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:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -746,12 +758,12 @@ msgstr "" " ! Lanza un subshell\n" " ? Muestra esta ayuda\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" @@ -762,35 +774,35 @@ msgstr "" # 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:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "No hay volumen nuevo; finalizando.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "La orden `%s' falló" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s no continúa en este volumen" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s no continúa en este volumen" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s tiene un tamaño erróneo (%s != %s + %s)" @@ -810,8 +822,9 @@ msgstr "%s tiene un tama # él solito. # Todavía espero una solución mágica que sea mejor que las dos # que tenemos hasta ahora. -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volumen está fuera de secuencia" # Ojo que esto podría referirse a "is not being labelled NOW" en vez de @@ -820,17 +833,17 @@ msgstr "Este volumen est # 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:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "El archivo no está etiquetado para que coincida con %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "El volumen %s no coincide con %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, fuzzy, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -839,6 +852,14 @@ msgstr "" "cabecera\n" "multivolumen de GNU" +# 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:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "El fin del archivo %s no está en un límite de bloque" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -850,8 +871,8 @@ msgstr[1] "S msgid "Contents differ" msgstr "El contenido es distinto" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fin de fichero inesperado en el archivo" @@ -1004,7 +1025,7 @@ msgid "%s: file is on a different filesystem; not dumped" 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 #, fuzzy msgid "contents not dumped" msgstr " (memoria volcada)" @@ -1051,7 +1072,7 @@ msgstr "%s: el fichero es el propio archivo; no se vuelca" msgid "%s: File removed before we read it" msgstr "%s: El fichero fue borrado antes de leerlo" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 #, fuzzy msgid "directory not dumped" msgstr "%s: contiene una marca de directorio caché; no se vuelca" @@ -1113,175 +1134,175 @@ msgstr "Extrayendo ficheros contiguos como ficheros regulares" # 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:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Intentando la extracción de enlaces simbólicos como enlaces duros" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Leyendo %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, 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" # ¿No se referirá al autor a "mangled filenames"?... jmg # FIXME. Preguntárselo. -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Fin de fichero inesperado en los nombres modificados" # FIXME. Lo de las comillas '%c'. # Como antes, lo estandarizo en la traducción a pesar de todo. -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tipo de fichero `%c' desconocido, se extrae como fichero normal" -#: src/extract.c:1184 +#: src/extract.c:1181 #, fuzzy, c-format msgid "Current %s is newer or same age" msgstr "El `%s' actual es más reciente" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: No se pudo hacer copia de seguridad de este fichero" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: No se puede renombrar a %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "El error no es recuperable: salida ahora" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: El directorio ha sido renombrado" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: El directorio ha sido renombrado" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: El directorio es nuevo" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Marca de tiempo inválida" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Se ha especificado un modo no válido en la opción" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Número de dispositivo inválido" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Número de nodo-i inválido" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 #, fuzzy msgid "Read error in snapshot file" msgstr "Error de lectura en %s" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de fichero inesperado en el archivo" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Argumento de densidad mal formado: '%s'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Argumento de densidad mal formado: '%s'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, 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:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: el directorio está en un dispositivo distinto: no se purga" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: No se puede borrar" @@ -1301,19 +1322,19 @@ msgstr "bloque %s: ** Bloque de NULos **\n" msgid "block %s: ** End of File **\n" msgstr "bloque %s: ** Fin de Fichero **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "bloque %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1321,68 +1342,68 @@ msgstr "" "se supone complemento a dos" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "El valor octal %.*s del archivo está fuera del rango %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "El archivo contiene cabeceras base 64 obsoletas" -#: src/list.c:763 +#: src/list.c:772 #, 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" -#: src/list.c:794 +#: src/list.c:803 #, 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" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:823 +#: src/list.c:832 #, c-format msgid "Archive contains %.*s where numeric %s value expected" 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:845 +#: src/list.c:854 #, fuzzy, 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" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " enlace a %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " tipo de fichero desconocido %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Enlace largo--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Nombre largo--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Cabecera de Volumen--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continúa en el byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Creando el directorio:" @@ -1419,24 +1440,24 @@ msgstr "canal de interproceso" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: No se encuentra en el archivo" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: El elemento solicitado no se encuentra en el archivo" @@ -1476,7 +1497,7 @@ msgstr "" # # 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:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1521,7 +1542,7 @@ msgstr "" # # 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:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1552,73 +1573,73 @@ msgstr "" " en otro caso\n" " never, simple siempre hace copias de seguridad simples\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Modo principal de operación:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "lista el contenido de un archivo" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "extrae ficheros de un archivo" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "crea un nuevo archivo" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "encuentra las diferencias entre un archivo y el sistema de ficheros" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "añade ficheros al final de un archivo" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "solamente añade ficheros más recientes que la copia del archivo" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "añade ficheros tar a un archivo" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "borra del archivo (¡no en cintas magnéticas!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Modificadores de operación:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "maneja ficheros dispersos de forma eficiente" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "maneja el formato GNU antiguo de respaldo incremental" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FICHERO" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "maneja el nuevo formato GNU de respaldo incremental" @@ -1629,16 +1650,16 @@ msgstr "maneja el nuevo formato GNU de respaldo incremental" # # encuentre ficheros ilegibles. (¡Uf! Ahora a ver cómo se pone esto en # # media línea.) gag # -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "no sale con estado distinto de cero cuando hay ficheros ilegibles" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NÚMERO" -#: src/tar.c:409 +#: src/tar.c:411 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1652,202 +1673,202 @@ msgstr "" "ó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:415 +#: src/tar.c:417 #, fuzzy msgid "archive is seekable" msgstr "El archivo admite `seek'" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "intenta verificar el archivo después de escribirlo" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "borra los ficheros después de añadirlos al archivo" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "no reemplaza ficheros que existan al extraer" -#: src/tar.c:435 +#: src/tar.c:437 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 " "en el archivo" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "sobreescribe los ficheros que existan al extraer" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "borra cada fichero antes de extraer sobre él" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "vacía jerarquías antes de extraer directorios" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "conserva los metadatos de los directorios que existan" -#: src/tar.c:445 +#: src/tar.c:447 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "sobreescribe los ficheros que existan al extraer" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "extrae los ficheros a la salida estándar" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "ORDEN" -#: src/tar.c:456 +#: src/tar.c:458 #, fuzzy msgid "pipe extracted files to another program" msgstr "extrae los ficheros a la salida estándar" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Manejo de los atributos del fichero:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "fuerza NOMBRE como propietario de los ficheros que se añaden" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "fuerza NOMBRE como grupo para los ficheros que se añaden" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "FECHA-O-FICHERO" -#: src/tar.c:472 +#: src/tar.c:474 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "CAMBIOS" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "fuerza CAMBIOS (simbólicos) de modo para los ficheros que se añaden" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "no extrae la fecha de modificación del fichero" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "intenta extraer los ficheros con el mismo propietario" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "extrae los ficheros como usted mismo" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "utiliza siempre números para los nombres de usuarios/grupos" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "ordena los nombres que se extraen para que coincidan con el archivo" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "lo mismo que -p y -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Selección de dispositivo y opciones:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHIVO" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "utiliza un archivo o el dispositivo ARCHIVO" -#: src/tar.c:513 +#: src/tar.c:515 #, fuzzy msgid "archive file is local even if it has a colon" msgstr "el archivo es local incluso si tiene dos puntos" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "utiliza la ORDEN rmt dada en vez de rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "utiliza la ORDEN remota en vez de rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "especifica la unidad y la densidad" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "crea/lista/extrae un archivo multivolumen" @@ -1861,38 +1882,38 @@ msgstr "crea/lista/extrae un archivo multivolumen" # 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:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "cambia la cinta después de escribir NÚMERO x 1024 bytes" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "ejecuta un script al final de cada cinta (implica -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "usa/actualiza el número de volumen en FICHERO" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Bloques en los dispositivos:" -#: src/tar.c:549 +#: src/tar.c:551 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:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOQUES x 512 bytes por registro" -#: src/tar.c:552 +#: src/tar.c:554 #, fuzzy msgid "NUMBER of bytes per record, multiple of 512" msgstr "TAMAÑO bytes por registro, múltiplo de 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" "no tiene en cuenta los bloques convertidos en ceros dentro de un archivo " @@ -1907,7 +1928,7 @@ msgstr "" # # 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:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "rehace los bloques conforme se lee (para tuberías de 4.2BSD)" @@ -1916,70 +1937,70 @@ msgstr "rehace los bloques conforme se lee (para tuber # 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:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Selección del formato de archivo:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMATO" -#: src/tar.c:564 +#: src/tar.c:566 #, fuzzy msgid "create archive of the given format" msgstr "crea un archivo en el formato dado." -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMATO es uno de los siguientes:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "formato tar V7 antiguo" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "formato GNU de tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "formato GNU tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formato POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formato POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 #, fuzzy msgid "same as pax" msgstr "Lo mismo que pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "lo mismo que --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "lo mismo que --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "palabra[[:]=valor][,palabra[[:]=valor], ...]" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "palabras clave de control de pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEXTO" -#: src/tar.c:587 +#: src/tar.c:589 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " @@ -1988,74 +2009,88 @@ msgstr "" "crea un archivo con nombre de volumen NOMBRE. En el momento de listar/" "extraer, utiliza TEXTO como patrón expandible" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Opciones de compresión en conflicto" -#: src/tar.c:594 +#: src/tar.c:596 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "No se puede escribir al programa de compresión" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "filtra el archivo a través de bzip2" # FIXME: Decir al autor que ponga el "itself". sv -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "filtra el arhivo a través de gzip" # FIXME: Decir al autor que ponga el "itself". sv -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "filtra el archivo a través de compress" # FIXME: Decir al autor que ponga el "itself". sv -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "filtra el arhivo a través de gzip" -#: src/tar.c:606 +# FIXME: Decir al autor que ponga el "itself". sv +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "filtra el arhivo a través de gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "filtra a través de PROG (debe aceptar -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Selección del fichero local:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "DIR" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "cambia al directorio DIR" -#: src/tar.c:619 +#: src/tar.c:626 #, fuzzy msgid "get names to extract or create from FILE" msgstr "obtiene los nombres que se van a extraer o crear del fichero NOMBRE" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T lee nombres terminados en nulo, desactiva -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" @@ -2064,111 +2099,111 @@ msgstr "" # 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:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "PATRÓN" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "excluye ficheros, dados como un PATRÓN" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "excluye los patrones listados en FICHERO" -#: src/tar.c:631 +#: src/tar.c:640 #, 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é" -#: src/tar.c:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:644 +#: src/tar.c:653 #, fuzzy msgid "exclude directories containing FILE" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "evita descender automáticamente en los directorios" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "permanece en el sistema de ficheros locales al crear el archivo" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "opera recursivamente sobre los directorios (por omisión)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "no elimina la `/' inicial de los nombres de ficheros" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "NOMBRE-DE-MIEMBRO" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "comienza por el miembro NOMBRE-DE-MIEMBRO dentro del archivo" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "FECHA" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "compara la fecha y hora solamente cuando cambian los datos" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "se hace un respaldo antes de borrar, escoja el CONTROL de versión" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "CADENA" -#: src/tar.c:669 +#: src/tar.c:678 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -2178,97 +2213,97 @@ msgstr "" "que se\n" "cambie con la variable de entorno SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "elimina NÚMERO componentes iniciales de los nombres de ficheros" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 #, fuzzy msgid "ignore case" msgstr "la exclusión no distingue mayúsculas de minúsculas" -#: src/tar.c:689 +#: src/tar.c:699 #, fuzzy msgid "patterns match file name start" msgstr "" "los patrones de exclusión encajan con el comienzo del nombre del fichero" -#: src/tar.c:691 +#: src/tar.c:701 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "los patrones de exclusión encajan después de cualquier / (por omisión)" -#: src/tar.c:693 +#: src/tar.c:703 #, fuzzy msgid "case sensitive matching (default)" msgstr "la exclusión distingue mayúsculas de minúsculas (por omisión)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "los comodines de patrones de exclusión no encajan con '/'" -#: src/tar.c:701 +#: src/tar.c:711 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "" "los comodines de los patrones de exclusión encajan con '/' (por omisión)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Salida informativa:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "lista los ficheros procesados detalladamente" -#: src/tar.c:711 +#: src/tar.c:721 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "muestra mensajes de progreso cada 10 registros" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "muestra un mensaje si no se vuelcan todos los enlaces" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2276,28 +2311,28 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "muestra las fechas de modificación de los ficheros en UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "envía la salida detallada a FICHERO" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "muestra el número de bloque dentro del archivo con cada mensaje" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "pide confirmación para cada acción" -#: src/tar.c:733 +#: src/tar.c:743 #, fuzzy msgid "show tar defaults" msgstr "Muestra los valores predeterminados de tar" -#: src/tar.c:735 +#: src/tar.c:745 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " @@ -2306,31 +2341,31 @@ msgstr "" "Cuando se lista o extrae, lista cada directorio que no coincida con el " "criterio de búsqueda" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Opciones de compatibilidad:" -#: src/tar.c:753 +#: src/tar.c:763 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" @@ -2339,58 +2374,58 @@ msgstr "" "al crear, lo mismo que --old-archive. Al extraer, lo mismo que --no-same-" "owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Otras opciones:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "No se puede especificar más de una opción `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Opciones de compresión en conflicto" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " tipo de fichero desconocido %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "No se encontró la fecha del fichero" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Sustituyendo %s por el formato de fecha desconocido %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, fuzzy, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Se trata la fecha `%s' como %s + %ld nanosegundo" # FIXME: Decir al autor que ponga el "itself". sv -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: el fichero es el propio archivo; no se vuelca" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2398,15 +2433,15 @@ msgstr "" "\n" "Las opciones predeterminadas de *esta* versión de tar son:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Factor de bloqueo inválido" -#: src/tar.c:1340 +#: src/tar.c:1369 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?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Longitud de cinta inválida" @@ -2416,98 +2451,104 @@ msgstr "Longitud de cinta inv # 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:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Se ha especificado más de una fecha tope" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Grupo inválido" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Se ha especificado un modo no válido en la opción" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Número inválido" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Propietario inválido" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "El tamaño del registro es inválido" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "El tamaño del registro debe ser múltiplo de %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Número inválido de elementos" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "Argumento de densidad mal formado: '%s'" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Densidad desconocida: '%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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]'" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FICHERO]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "La opción antigua `%c' requiere un argumento" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence no tiene sentido sin una lista de ficheros" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "no se puede usar --occurrence en el modo de operación solicitado" # requieren -> necesitan. gerardo -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Los archivos múltiples requieren la opción `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "No se puede combinar --listed-incremental con --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2516,51 +2557,52 @@ msgstr[0] "" msgstr[1] "" "%s: La etiqueta de volumen es demasiado larga (el límite es %lu bytes)" -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "No se pueden verificar archivos multivolumen" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "No se pueden verificar archivos comprimidos" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "No se pueden utilizar archivos multivolumen comprimidos" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "No se pueden actualizar archivos comprimidos" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option solamente se puede usar en archivos POSIX" +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + # Me gusta más al verrés: cobarde rechazo [de la pradera] a... gerardo -#: src/tar.c:2318 +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Rechazo cobarde a crear un archivo vacío" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Las opciones `-Aru' son incompatibles con `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Debe especificar una de las opciones `-Acdtrux'" -# 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.) -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Salida con error demorada desde errores anteriores" +msgid "Exiting with failure status due to previous errors" +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... @@ -2584,83 +2626,83 @@ msgstr[0] "%s: El tama msgstr[1] "%s: El tamaño del fichero ha disminuido en %s bytes" # FIXME: Imlemented -#: src/xheader.c:158 +#: src/xheader.c:156 #, fuzzy, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "La palabra clave %s es desconocida o no está implementada todavía" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "No se puede usar el patrón %s" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "La palabra clave %s no se puede sustituir" -#: src/xheader.c:498 +#: src/xheader.c:496 #, fuzzy msgid "Malformed extended header: missing length" msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, 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" -#: src/xheader.c:525 +#: src/xheader.c:523 #, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "" "Cabecera extendida errónea: falta un espacio en blanco después de la longitud" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:539 +#: src/xheader.c:537 #, fuzzy msgid "Malformed extended header: missing newline" msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, fuzzy, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, fuzzy, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Cabecera extendida errónea: falta un signo igual" @@ -2832,52 +2874,62 @@ msgstr "N msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Error del sistema desconocido" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "No se puede abrir %s" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "No se puede cerrar" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " tipo de fichero desconocido %s\n" @@ -2888,47 +2940,47 @@ msgstr " tipo de fichero desconocido %s\n" # 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 -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "No se puede leer el estado del fichero %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "El proceso hijo terminó con la señal %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Nombres de fichero modificados--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -3088,6 +3140,16 @@ msgstr "" #~ 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 @@ -3742,12 +3804,6 @@ msgstr "" #~ "Copyright 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, " #~ "Inc.\n" -# 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 -#~ msgid "Archive %s EOF not on block boundary" -#~ msgstr "El fin del archivo %s no está en un límite de bloque" - # ¿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 diff --git a/po/et.gmo b/po/et.gmo index 9b45a27e8acd43f42b4d8526f012307500809895..e144ec22e769a037381e89afeeab2a782900ba27 100644 GIT binary patch delta 10345 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 VHU4_;c=v?t+>G?n4(l6+{vXKibcp}} diff --git a/po/et.po b/po/et.po index 747f07c..70878e4 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.15.92\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2006-10-26 14:45+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -80,7 +80,7 @@ msgstr " [V msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "`%s --help' või `%s --usage' annab rohkem infot.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Teated vigadest saatke palun aadressil %s.\n" @@ -89,15 +89,15 @@ msgstr "Teated vigadest saatke palun aadressil %s.\n" msgid "Unknown system error" msgstr "Tundmatu süsteemi viga" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "näita seda abiinfot" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "näita lühikest kasutamise õpetust" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NIMI" @@ -110,11 +110,11 @@ msgstr "sea programmi nimi" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "oota SEK sekundeid (vaikimisi 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "esita programmi versioon" @@ -132,7 +132,7 @@ msgstr "%s: Liiga palju argumente\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(PROGRAMMI VIGA) Võti peaks olema ära tuntud!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -191,16 +191,16 @@ msgstr "%s: v msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: võti `-W %s' ei luba argumenti\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "mälu on otsas" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Ei õnnestu vahetada töökataloogi" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Töökataloogi ei õnnestu salvestada" @@ -319,11 +319,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[jJ]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[eE]" @@ -524,104 +536,104 @@ msgstr "Ootamatu faili l msgid "Garbage command" msgstr "Rämpskäsk" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Hmm.... see ei tundu olema tar arhiiv" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Baite kirjutatud kokku" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Baite loetud kokku" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Baite kirjutatud kokku: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(toru)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Kirje suuruse väärtus on vigane" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Arhiivi nime pole" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Ei saa kontrollida sisend/väljund arhiive" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiiv on tihendatud. Kasutage võtit %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Ei saa uuendada pakitud arhiive" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Lindi alguses, lõpetan töö" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Liig palju vigu, jätan töö pooleli" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ei peatunud kirje piiril" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sisaldab vigast volüümi numbrit" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Volüümi number on liiga suur" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Otsi volüüm #%d %s'le ja vajuta return klahvi: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF kasutaja vastuse asemel" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "HOIATUS: Arhiiv pole täielik" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -632,64 +644,65 @@ msgstr "" " q Katkesta tar\n" " y või reavahetus Jätka\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Loo alamshell\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Väljasta see info\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Pole uus volüüm; lõpetan töö.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Puudub faili nimi. Proovige uuesti.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Vigane sisend. ? annab abiinfot.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "%s käsklus sai vea" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s ei jätku sellel volüümil" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s on vale suurusega (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "See volüüm on väljaspoolt järjekorda" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiivi märgend ei sobi `%s'" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Volüüm `%s' ei sobi volüümiga `%s'" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -697,6 +710,11 @@ msgstr "" "%s: faili nimi on GNU mitmevolüümi päisesse salvestamiseks liiga pikk, " "lühendan" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek ei peatunud kirje piiril" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -708,8 +726,8 @@ msgstr[1] "Sain lugeda ainult %lu baiti (sooviti %lu)" msgid "Contents differ" msgstr "Sisu on erinev" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Ootamatu arhiivi lõpp" @@ -826,7 +844,7 @@ msgstr[1] "%s: Fail l msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fail on teises failisüsteemis; ei salvesta" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -855,7 +873,7 @@ msgstr "%s on arhiiv; ei salvesta" msgid "%s: File removed before we read it" msgstr "%s: Fail kustutati enne lugemist" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 #, fuzzy msgid "directory not dumped" msgstr "%s: sisaldab vahemälu kataloogi lipikut; ei salvesta" @@ -907,165 +925,165 @@ msgstr "%s: Kataloog nimetati msgid "Extracting contiguous files as regular files" msgstr "Taastan jätkuvad failid kui tavalised" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Üritan taastada nimeviiteid viidetena" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Loen %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ei saa taastada -- fail jätkub teisel volüümil" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Ootamatu pika nime päis" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tundmatu failitüüp `%c', taastan tavalise failina" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Olemasolev %s on uuem või sama kuupäevaga" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Selle faili varundamine ebaõnnestus" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "%s ei õnnestu ümber nimetada %s-ks" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Ületamatu tõrge: lõpetan töö" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Kataloog %s on ümber nimetatud" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Kataloog on ümber nimetatud" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Kataloog on uus" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Vigane ajatempel" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Vigane muutmise aeg (sekundid)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Vigane muutmise aeg (nanosekundid)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Vigane seadmenumber" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Vigane i-kirje number" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Snapshoti faili lugemisel leiti liiga pikk väli" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Snapshoti failist lugemise viga" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Ootamatu snapshoti faili lõpp" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Snapshoti failis on väljal ootamatu väärtus" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Puudub kirje lõpetaja" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Inkrementaalse faili vorming on vigane" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Mittetoetatud inkrementaalse vormingu versioon: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Vigane taastamise kataloog: eeldasin '%c', sain %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Vigane taastamise kataloog: dubleeritud 'X'" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Vigane taastamise kataloog: tühi nimi 'R' väljal" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Vigane taastamise kataloog: 'R' ei ole 'T' ees" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Vigane taastamise kataloog: tühi nimi 'T' väljal" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Vigane taastamise kataloog: 'X' ei kasutata" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Vormiga %s ei saa ajutist kataloogi luua" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ei puhasta kataloogi: stat ebaõnnestus" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: kataloog on teisel seadmel; ei puhasta" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Kustutan %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei saa eemaldada" @@ -1085,87 +1103,87 @@ msgstr "blokk %s: ** NULlide blokk **\n" msgid "block %s: ** End of File **\n" msgstr "blokk %s: ** Faili lõpp **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blokk %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, c-format msgid "Blanks in header where numeric %s value expected" 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:717 +#: src/list.c:726 #, 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" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arhiivi kaheksandväärtus %.*s on %s piiridest väljas" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiiv sisaldab aegunuid base-64 päiseid" -#: src/list.c:763 +#: src/list.c:772 #, 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" -#: src/list.c:794 +#: src/list.c:803 #, c-format msgid "Archive base-256 value is out of %s range" 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " viide %s-le\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " tundmatu failitüüp %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Pikk viide--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Pikk nimi--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Volüümi päis--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Jätkub baidilt %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Loon kataloogi:" @@ -1202,24 +1220,24 @@ msgstr "protsessidevaheline kanal" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Failide nimedes on jokkersümbolid. Nende kasutamiseks" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "kasutage --wildcars, selle teate saab blokeerida võtmega" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "--no-wildcards." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Puudub arhiivis" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Nõutud eksemplar puudub arhiivis" @@ -1245,7 +1263,7 @@ msgid "" msgstr "" "Tundmatu kvootimise stiil `%s'. Loendi saate käsuga `%s --quoting-style=help'" -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1263,7 +1281,7 @@ msgstr "" " 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:343 +#: src/tar.c:345 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 " @@ -1283,86 +1301,86 @@ msgstr "" " nil, existing nummerdatud kui koopiad on nummerdatud, muidu lihtne\n" " never, simple tee ainult lihtne koopia\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Põhiline töö:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "näita arhiivi sisukorda" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "taasta failid arhiivist" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "loo uus arhiiv" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "otsi arhiivi ja failisüsteemi erinevusi" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "lisa failid arhiivi lõppu" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "lisa arhiivi ainult failid uuemad kui arhiivis" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "lisa tar failid arhiivi" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "kustuta arhiivist (mitte magnetlindilt!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "testi arhiivi volüümi märgendit ja lõpeta töö" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Töö täpsustamine:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "tööta aukudega failidega efektiivsemalt" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "PÕHI[.ALAM]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "määra aukudega faili vormingu versioon (eeldab võtit --sparse)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "käsitle vana GNU vormingus inkrementaalset koopiat" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FAIL" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "käsitle uue GNU vormingu inkrementaalset koopiat" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "ära lõpeta loetamatute failide korral veakoodiga" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1375,116 +1393,116 @@ msgstr "" "antud\n" "käsureal või võtmega -T. Vaikimisi N on 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "arhiiv on positsioneeritav" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Ülekirjutamise juhtimine:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "kontrolli arhiivi peale arhiivi kirjutamist" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "kustuta failid peale arhiveerimist" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "olemasolevaid faile taastamisel üle ei kirjuta" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "ära kirjuta üle olemasolevaid faile, mis on uuemad kui arhiveeritud" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "kirjuta olemasolevad failid üle" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "kustuta fail enne taastamist" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "kustuta hierarhia enne kataloogi taastamist" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "säilita olemasolevate kataloogide metainfo" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "taastamisel kirjuta olemasolevate kataloogide metainfo üle (vaikimisi)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Vali väljundvoog:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "taasta failid standardväljundisse" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KÄSK" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "taasta failid läbi toru teise programmi" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "ignoreeri alamprotsesside lõpetamise koode" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "käsitle alamprotsesside nullist erinevaid lõpetamise koode veana" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Faili atribuutide käsitlemine:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "kasuta NIMEe kui lisatud failide omanikku" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "kasuta NIMEe kui lisatud failide gruppi" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "KUUP-VÕI-FAIL" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "sea lisatud failide muutmise ajaks KUUP-VÕI-FAIL" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "MUUTUSED" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "kasuta lisatud failidel sümbol moodi MUUTUSED" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "MEETOD" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1494,27 +1512,27 @@ msgstr "" "lugemist (METHOD='replace'; vaikimisi) või ei muuda kasutamise aega üldse " "(METHOD='system')" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "ära taasta faili muutmise aega" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "säilita taastamisel failide omanikud" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "taasta failid enda õigustes" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "kasuta kasutaja/grupp numbreid" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "taasta ka info failide õigustest (vaikimisi superkasutaja korral)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1522,154 +1540,154 @@ msgstr "" "õiguste taastamisel kasuta kasutaja umask väärtust (vaikimisi " "tavakasutajatel)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "taasta failid arhiveerimis järjekorras" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "sama, kui -p ja -s" -#: src/tar.c:500 +#: src/tar.c:502 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" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "katkesta --delay-directory-restore võtme mõju" -#: src/tar.c:508 +#: src/tar.c:510 #, fuzzy msgid "Device selection and switching:" msgstr "Seadme valik ja vahetamine:\n" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARHIIV" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "kasuta arhiivi faili või seadet ARHIIV" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "arhiivi fail on lokaalne isegi kui sisaldab koolonit" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "kasuta rmt asemel antud käsku" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "kasuta rsh asemel antud käsku" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "määra seade ja tihedus" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "loo/näita/taasta mitme volüümilisi arhiive" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "vaheta peale NUMBER x 1024 baidi kirjutamist linti" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "käivita iga lindi lõpus skript (eeldab võtit -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "kasuta/uuenda volüümi numbrit failis FAIL" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Seadme blokkimine:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOKKE" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKKE x 512 baiti kirjele" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMBER baiti kirjele, 512 kordne" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignoreeri null blokke arhiivis (tähistab EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "bloki lugemisel uuesti (4.2BSD torude jaoks)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Arhiivi vormingu valikud:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "VORMING" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "loo arhiiv antud vormingus" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "VORMING on üks järgnevaist:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "vana V7 tar vorming" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "GNU vorming tar <= 1.12 korral" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x vorming" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) vorming" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) vorming" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "sama, kui pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "sama, kui --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "sama, kui --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "võtmesõna[[:]=väärtus][,võtmesõna[[:]=väärtus]...]" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "pax võtmesõnade kasutamine" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1677,178 +1695,191 @@ msgstr "" "loo arhiivi volüümi nimega NIMI. Listingu/taastamise ajal kasuta TEKSTi " "otsingumustrina" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Konfliktsed pakkimisvõtmed" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "filtreeri arhiiv läbi bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "filtreeri arhiiv läbi gzipi" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "filtreeri arhiiv läbi compressi" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "filtreeri arhiiv läbi gzipi" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "filtreeri arhiiv läbi gzipi" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "filtreeri läbi programmi (peab lubama võtit -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Lokaalse faili valik:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "KAT" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "mine kataloogi KAT" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "loe taastatavate või varundatavate failide nimed failist NIMI" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T loeb nullidega lõpetatud nimesid, blokeeri -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "eemalda -T võtmega loetud failinimedest kvootimissümbolid (vaikimisi)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "ära eemalda -T võtmega loetud failinimedest kvootimissümboleid" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "MUSTER" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "MUSTRI järgi välistatud failid" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "välistavad mustrid on FAILIS" -#: src/tar.c:631 +#: src/tar.c:640 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:644 +#: src/tar.c:653 #, fuzzy msgid "exclude directories containing FILE" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "ära sisene kataloogidesse" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "püsi arhiivi loomise ajal kohalikus failisüsteemis" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "sisene kataloogidesse (vaikimisi)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "ära eemalda faili nimedelt prefiksit `/'" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "järgi nimeviiteid; arhiveeri ja taasta viidatavad failid" -#: src/tar.c:658 +#: src/tar.c:667 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "järgi nimeviiteid; arhiveeri ja taasta viidatavad failid" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "KOMPONENT" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "alusta arhiivi liikmest KOMPONENT" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "salvesta ainult failid mis on uuemad kui KUUP-VÕI-FAIL" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "KUUPÄEV" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "võrdle kuupäevi ainult kui andmed on muutunud" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "KONTROLL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "loo enne eemaldamist varukoopia, vali versioonikontroll" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "SÕNE" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1856,87 +1887,87 @@ msgstr "" "varunda enne kustutamist, kasuta uut lõppu (vaikimisi '~', kui pole üle " "määratud keskkonnamuutujaga SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Failide nimede muutmine:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "eemalda taastamisel failide nimede algusest NUMBER komponenti" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "AVALDIS" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "kasuta failide nimede muutmiseks sed asendus avaldist" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Failinimede otsimine (mõjutab nii kaasamist, kui välistamist):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "tõstutundetu" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "mustrid alustavad faili nime algusest" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "mustrid toimivad iga / järel (välistamise korral vaikimisi)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "tõstutundlik otsimine (vaikimisi)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "kasuta jokkersümboleid (välistamise korral vaikimisi)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "täht-täheline sõne otsimine" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "jokkerid ei leia '/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "jokkersümbolid leiavad '/' (välistamise korral vaikimisi)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Informatsioon:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "väljasta töödeldavate failide kohta infot" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "anna töö kohta infot iga NUMBER kirje järel (vaikimisi 10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "väljasta teade, kui kõike viiteid pole salvestatud" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SIGNAAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1947,27 +1978,27 @@ msgstr "" "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:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "väljasta failide muutmise ajad UTC esituses" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "salvesta täiendav info FAILi" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "näita iga teatega ka arhiivi bloki numbrit" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "küsi iga tegevuse kohta kinnitust" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "näita tar vaikeseadeid" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -1975,86 +2006,86 @@ msgstr "" "listingu või taastamise ajal, näita igat kataloogi mis ei vasta " "otsingutingimustele" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "peale teisendamist näita faili või arhiivi nime" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STIIL" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "määra nimede kvootimise stiil; lubatud väärtused on toodud allpool" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "lisaks kvoodi sõnes näidatud sümbolid" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "keela sõnes toodud sümbolite kvootimine" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Ühilduvuse võtmed:" -#: src/tar.c:753 +#: src/tar.c:763 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:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Muud võtmed:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "blokeeri potentsiaalselt ohtlikud võtmed" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Korraga ainult üks võtmetest `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Konfliktsed pakkimisvõtmed" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Tundmatu signaali nimi: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Kuupäeva fail puudub" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Kasutan %s tundmatu ajaformaadi %s asemel" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Võti %s: Käsitlen aega `%s' kui %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: failide nimekiri on juba loetud" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: loetud faili nimi sisaldab sümbolit nul" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Võtmega --quoting-style on lubatud järgnevad argumendid:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2062,151 +2093,165 @@ msgstr "" "\n" "*See* tar kasutab vaikimisi:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Vigane blokkimisfaktor" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Hoiatus: võtit -I ei toetata; võibolla te pidasite silmas -j või -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Vigane lindi pikkus" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Rohkem kui üks etteantud aeg" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Vigane aukudega faili versiooni väärtus" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ei ole sellel platvormil toetatud" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "--checkpoint väärtus ei ole täisarv" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Vigane grupp" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Võtmega anti vigane mood" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Vigane number" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Vigane omanik" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Vigane kirje suurus" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Kirje suurus peab olema %d kordne." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Vigane elementide arv" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Lubatud on ainult üks --to-command võti" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Vigane tiheduse argument: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Tundmatu tihedus: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "*See* tar ei toeta võtmeid `-[0-7][lmh]'" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FAIL]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Vana võti `%c' nõuab argumenti." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ei oma failide nimekirjata mõtet" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence ei saa valitud tööre¸iimil kasutada" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Mitme arhiivifaili kasutamine nõuab võtit `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental ja --newer ei saa koos kasutada" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Ei suuda kontrollida mitme volüümilisi arhiive" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Ei saa kontrollida pakitud arhiive" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Ei saa kasutada mitme volüümilisi pakitud arhiive" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Tihendatud arhiive ei saa ühendada" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option saab kasutada ainult POSIX arhiividega" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Ega ikka ei tee küll tühja arhiivi" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Võtmeid `-Aru' ei saa kasutada võtmega `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Peab kasutama vähemalt üht võtmetest `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Eelnevad vead ei lõpetanud veel programmi tööd, lõpetan veaga" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2215,79 +2260,79 @@ 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" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Võtmesõna %s on tundmatu või pole veel realiseeritud" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Mustrit %s ei saa kasutada" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Võtmesõna %s ei saa ümber määrata" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Vigane laiendatud päis: puudub pikkus" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Laiendatud päise pikkus on piiridest väljas" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "Laiendatud päise pikkus %*s on piiridest väljas" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Vigane laiendatud päis: pikkuse järel puudub tühik" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Vigane laiendatud päis: puudub võrdusmärk" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Vigane laiendatud päis: puudub reavahetus" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Ignoreerin tundmatud laiendatud päise võtmesõna `%s'" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, 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" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Vigane laiendatud päis: %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Vigane laiendatud päis: liigne %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Vigane laiendatud päis: vigane %s: ootamatu eraldaja %c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Vigane laiendatud päis: vigane %s: veider arv väärtuseid" @@ -2455,101 +2500,115 @@ msgstr "Number on piiridest v msgid "Negative size: %s" msgstr "Negatiivne suurus: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) ebaõnnestus" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Viga `%s' juures numbri parsimisel" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Tundmatu kuupäeva vorming" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGUMENDID...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "`%s' ei saa avada" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "%s: Ei õnnestu liikuda positsioonile %s" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "faili nimi sisaldab null sümbolit" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, 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" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "vigane mask (`%s' lähedal)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Tundmatu väli `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "ei õnnestu seada `%s' aega" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Käsk lõpetas töö edukalt\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Käsk lõpetas veakoodiga %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Käsk katkestati signaaliga %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Käsk peatati signaaliga %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Käsk salvestas mälupildi\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Käsk katkestas\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat nõuab failinimesid" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "liiga palju argumente" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "katkesta --delay-directory-restore võtme mõju" + #~ msgid "block size" #~ msgstr "bloki suurus" @@ -2578,3 +2637,6 @@ msgstr "liiga palju argumente" #~ msgid "[.]NUMBER" #~ msgstr "[.]NUMBER" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Eelnevad vead ei lõpetanud veel programmi tööd, lõpetan veaga" diff --git a/po/eu.gmo b/po/eu.gmo index 5a562739bf9ddd66d58877902a5f4dba994640d4..7dc93c184e2bfd46c60cb0b0919a1e9279f8a26a 100644 GIT binary patch delta 8805 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 YLsD|J-^jDgs{LohHLV_9{#Nt<2UkY}=whV@{fq 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\n" "Language-Team: Basque \n" @@ -83,7 +83,7 @@ msgstr " [AUKERA...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "`%s --help' edo `%s --usage' saiatu argibide gehiagorako.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Arazoen berri %s-en eman.\n" @@ -92,15 +92,15 @@ msgstr "Arazoen berri %s-en eman.\n" msgid "Unknown system error" msgstr "Sistema errore ezezaguna" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "laguntza zerrenda hau eman" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "erabilera mezu labur bat eman" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "IZENA" @@ -113,11 +113,11 @@ msgstr "programa izen ezarri" msgid "SECS" msgstr "SEG" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "SEG segundu gelditu (lehenetsia 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "programa bertsioa bistarazi" @@ -135,7 +135,7 @@ msgstr "%s: Argumentu gehiegi\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(PROGRAMA ERROREA) Aukera ezaguna izan beharko zen!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -194,16 +194,16 @@ msgstr "%s: `-W %s' aukera anbiguoa da\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' aukerak ez du argumenturik onartzen\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "memoria askieza" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Ezin da lan direktorioa aldatu" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Ezin da lan direktorioa gorde" @@ -322,11 +322,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[bB]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[eE]" @@ -527,102 +539,102 @@ msgstr "Fitxategi amaiera azkarregia" msgid "Garbage command" msgstr "Zabor komandoa" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Honek ez dirudi tar pakete bat" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Idatziriko byte-ak guztira" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Irakurritako byte-ak guztira" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Ezabaturiko byte-ak guztira: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(tutua)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "balio baliogabea record_size-rentzat" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Ez da fitxategi izenik eman" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Ezin da sarrera/irteera estandar fitxategia egiaztatu" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Fitxategia konprimiturik dago. %s aukera erabili" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Ezin dira konprimituriko fitxategiak eguneratu" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Zintaren hasieran, uzten" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Errore gehiegi, uzten" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: bolumen zenbaki baliogabea du" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Bolumen zenbaki gainezkatzea" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "#%d bolumena %s -rako prestatu eta enter sakatu: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Fitxategi amaiera erabiltzaile erantzuna espero zenean" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "Oharra: Paketea ez dago osaturik" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -633,70 +645,75 @@ msgstr "" " q tar utzi\n" " y edo intro Ekintza jarraitu\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Azpishell bat sortu\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Zerrenda hau inprimatu\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Ez dago bolumen berririk; uzten.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Ez da fitxategi izenik ezarri. Berriz saiatu.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "SArrera baliogabea. ? idatzi laguntzarako.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "%s komandoak huts egin du" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s ez da bolumen honen jarraipena" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s okerreko tamaina da (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Bolumen hau sekuentziatik kanpo dago" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "%s bolumena ez da %s-ren pareko" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, 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:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -708,8 +725,8 @@ msgstr[1] "%lu byte bakarrik irakurri daiteke %lu byte-tatik" msgid "Contents differ" msgstr "Eduki ezberdintasunak" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Esperogabeko Fitxategi amaiaera paketean" @@ -826,7 +843,7 @@ msgstr[1] "" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fitxategia fitxategi sistema ezberdin batetan dago, ez da irauliko" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -855,7 +872,7 @@ msgstr "%s: fitxategia paketea da, ez da irauliko" msgid "%s: File removed before we read it" msgstr "%s: Fitxategia irakurri baino lehen ezabaturik" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 #, fuzzy msgid "directory not dumped" msgstr "%s: katxe direktorioa marka bat du; ez da irauliko" @@ -907,171 +924,171 @@ msgstr "%s: Direktorioa bere egoera atera aurretik berrizendatua izan da" msgid "Extracting contiguous files as regular files" msgstr "Alboko fitxategiak fitxategi erregularrak bezala ateratzen" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Lotura sinbolikoak lotura gogor bezala ateratzen saiatzen" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "%s irakurtzen\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ezin da atera -- paketea beste bolumen baten jarraipena da" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Buru izen luzera esperogabea" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "" "%s: `%c' fitxategi mota ezezaguna, fitxategi arrunt bat bezala ateratzen" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Unekoa %s berriagoa edo data berdinekoa da" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Ez da gai fitxategi honen babeskopia egiteko" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Ezin da %s %s-ra berrizendatu" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Errorea berreskura ezina da: irteten" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktorioa %s-tik berrizendatua izan da" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktorioa berrizendatua izan da" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktorioa berria da" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "denbora marka baliogabea" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Eraldaketa denbora (segundu) baliogabea" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Eraldaketa denbora (nanosegundu) baliogabea" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "gailu zenbaki baliogabea" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Inodo zenbaki baliogabea" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Eremu luzeegia snapshot fitxategia irakurtzerakoan" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 #, fuzzy msgid "Read error in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Gordetze amaiera falta da" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Fitxategi inkremental formatu okerra" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, fuzzy, c-format msgid "Unsupported incremental format version: %" msgstr "Onartugabeko inkremental formatu bertsioa: %d" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, 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:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' bikoizturik" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'R'-en" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: 'T' ez doa 'R' atzean" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'T'-en" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' ez da inoiz erabili" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ezin da aldiroko direktorioa sortu %s txantiloia erabiliaz" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ez da direktorioa garbituko: ezin da egoera eskuratu" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ezabatzen\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ezin da ezabatu" @@ -1091,19 +1108,19 @@ msgstr "" msgid "block %s: ** End of File **\n" msgstr "%s blokea: ** Fitxategi Amaiera **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "%s blokea: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1111,68 +1128,68 @@ msgstr "" "direla pentsatuko da" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Paketearen zortzitar %.*s balioa %s eremutik kanpo dago" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Paketeak zaharkituriko base-64 buruak ditu" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " %s-ra lotu\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " %s fitxategi mota ezezaguna\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Lotura Luzea--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Izen Luzea--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Bolumen Burua--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--%s byte-an jarraitzen du--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Direktorioa sortzen:" @@ -1209,24 +1226,24 @@ msgstr "prozesu arteko kanala" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "ohar hau kendu." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ez da paketean aurkitu" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "" @@ -1253,7 +1270,7 @@ msgstr "" "`%s' markatze estilo ezezaguna. Saiatu `%s --quoting-style=help' zerrenda " "eskuratzeko." -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1284,7 +1301,7 @@ msgstr "" "erabili\n" " never, simple beti babeskopia sinpleak egin\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1316,87 +1333,87 @@ msgstr "" "erabili\n" " never, simple beti babeskopia sinpleak egin\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Ekintza nagusi modua:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "pakete baten edukiak zerrendatu" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "pakete batetako fitxategiak atera" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "pakete berri bat sortu" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "paketea eta fitxategi sistema arteko ezberdintasunak bilatu" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "fitxategiak paketearen amaieran gehitu" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" "paketean dauden kopiak baino berriagoak diren fitxategiak bakarrik gehitu" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "gehitu tar fitxategiak pakete batetara" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "paketetik ezabatu (ez mag zintetan!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "pakete bolumen etiketa egiaztatu eta irten" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Ekintza aldagaiak:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "sakabanatutako fitxategiak egoki kudeatu" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "GNU basbeskopia inkremenetal formatu zaharra kudeatu" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FITXATEGIA" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "GNU basbeskopia inkremenetal formatu berria kudeatu" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "ZENBAKIA" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1404,148 +1421,148 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "paketeak `seek' onartzen du" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 #, fuzzy msgid "Overwrite control:" msgstr "Gainidazketa kontrola:\n" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "fitxategia egiaztatzen saiatu idatzi aurretik" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "ezabatu fitxategiak paketera gehitu aurretik" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "ez ordezkatu dauden fitxategiak ateratzerakoan" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "gainidatzi dauden fitxategiak ateratzerakoan" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "dauden direktorioen metadata mantendu" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "dauden direktorioen metadata gainidatzi ateratzerakoan (lehenetsia)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Irteera korrontea hautatu:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "fitxategiak irteera estandarrera atera" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMANDOA" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "bideratu ateratako fitxategiak beste programa batetara" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "alde batetara utzi semeen irteera kodeak" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "zero ez diren semeen irteera kodeekin errore bat bezala jokatu" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Fitxategi atributu kudeaketa:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "indartu IZENA jabe bezala gehituriko fitxategientzat" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "indartu IZENA talde bezala gehituriko fitxategientzat" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATA-EDO-FITXATEGIA" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "ALDAKETAK" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "indartu (sinbolikoa) modu ALDAKETAK gehituriko lerroentzat" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "METODOA" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "ez atera fitxategi eraldaketa data" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "jabe berdinaren fitxategiak ateratzen saiatu" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "atera fitxategiak zure kabuz" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "beti erabili zenbakiak erabiltzaile/talde izenen ordez" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "fitxategi baimenei buruzko argibideak atera (lehenetsia root " "erabiltzailearentzat)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1553,426 +1570,439 @@ msgstr "" "erabiltzailearen umask-a erabili paketetik baimenak ateratzerakoan " "(lehenetsia erabiltzaile arruntentzat)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "-p eta -s bikotearen berdina" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore aukeraren eragina ezeztatu" -#: src/tar.c:508 +#: src/tar.c:510 #, fuzzy msgid "Device selection and switching:" msgstr "Gailu hautapen eta aldaketa:\n" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "PAKETEA" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "pakete fitxategia edo gailu PAKETEA erabili" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "pakete fitxategi lokala da nahiz bi puntu izan" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "Emandako rmt KOMANDOA erabili rmt ordez" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "Urruneko KOMANDOA erabili rsh ordez" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "Gailu eta dentsitatea ezarri" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "sortu/zerrendatu/atera bolumen-anitzeko paketea" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "zinta aldatu ZENBAKIA x 1024 byte idatzi ondoren" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "scipt-a abiarazi zinta bakoitzaren amaieran (-M behar du)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "erabili/eguneratu FITXATEGI bolumen zenbakia" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Gailu blokeak:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOKE" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKE x 512 byte grabazio bakoitzeko" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "grabazio bakoitzeko byte ZENBAKIA, 512-ren multiploa" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "paketean zeroz betetako blokeak alde batetara utzi" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "irakurri ahala berriz bloke egin (4.2BSD tutuentzat)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Pakete formatu hautapena:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMATUA" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "emandako formatuko pakete bat sortu" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMATUA hauetako bat da:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "V7 tar formatu zaharra" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "GNU formatua tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x formatua" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) formatua" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) formatua" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "pax-en berdina" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "--format=v7-ren berdina" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "--format=posix-ren berdina" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "gakoa[[:]=balioavalue][,gakoa[[:]=balioa]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TESTUA" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Elkarjotzen duten konpresio aukerak" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "fitxategia bzip2 bidez iragazi" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "fitxategia gzip bidez iragazi" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "fitxategia konpresorearen bidez iragazi" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "fitxategia gzip bidez iragazi" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "fitxategia gzip bidez iragazi" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "PROG bidez iragazi (-d onartu behar du)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Fixtategi lokal hautapena:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "DIR" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "DIR direktoriora aldatu" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "ateratzeko edo sortzeko izenak FITXATEGIA-tik eskuratu" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "PATROIA" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "fixtategiak utzi, PATROIA bezala emandakoak" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "FITXATEGIAN zerrendaturiko patroiak alde batetara utzi" -#: src/tar.c:631 +#: src/tar.c:640 #, 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:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:644 +#: src/tar.c:653 #, fuzzy msgid "exclude directories containing FILE" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "sahiestu automatikoki direktorioetan zehar jeistea" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "fitxategi sistema lokalean egon paketea sortzerakoan" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "direktorioetan barrena (lehenetsia)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "Ez kendu hasierako `/' fitxategi izenetatik" -#: src/tar.c:656 +#: src/tar.c:665 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:658 +#: src/tar.c:667 #, 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "PARTAIDE IZEN" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATA" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "data eta ordua parekatu data bakarrik aldatzen denean" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "KONTROL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "babeskopia egin ezabatu aurretik, KONTROL bertsioa hautatu" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "KATEA" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Fitxategi izen eraldaketak:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "ESPRESIOA" -#: src/tar.c:679 +#: src/tar.c:688 #, fuzzy msgid "use sed replace EXPRESSION to transform file names" msgstr "Sed-en ordezko EXPRESIOA erabili fitxategi izenak eraldatzeko" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "kasua alde batetara utzi" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "verbatim kate parekatzea" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "irteera informatiboa:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Aurrerapen mezuak bistarazi grabaketa ZENBAKI bakiotzagatik (lehenetsia 10 " "da)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "mezu bat inprimatu lotura guztiak ez badira iraultzen" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SEINALEA" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1980,262 +2010,276 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "eraldaketa datak UTC orduan bistarazi" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "irteera luzea FITXATEGIRA bidali" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "Bloke zenbakia bistarazu pakete bakoitzeko mezu bakoitzagatik" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "berrespena eskatu ekintza bakoitzean" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "tar lehenespenak bistarazi" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "fixtategi edo pakete izenak bistarazi eraldaketaren aurretik" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "ESTILOA" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "Gako karaktere gehigarriak KATE-tik" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "gakoak kendu karaktereentzat KATE-tik" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Bateragarritasun aukerak:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Beste aukerak:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "ezgaitu arriskutsu izan daitezken zenbait aukera" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Ezin duzu `-Acdtrux' aukera bat baino gehiago ezarri" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Elkarjotzen duten konpresio aukerak" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Seinale izen ezezaguna: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Data adibide fitxategia ez da aurkitu" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s %s data formatu ezezagunagatik aldatzen" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: fitxategi zerrenda irakurria dagoeneko" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style-entzat balio erabilgarriak:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Blokeo faktore baliogabea" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Oharra: -l aukera ez da onartzen; agian -j edo -T egin nahi zenuen?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Zinta luzera baliogabea" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Atari data bat baino gehiago" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ez da onartzen plataforma honetan" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "--checkpoint balioa ez da zenbaki oso bat" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Talde baliogabea" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Modu baliogabea eman da aukeran" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Zenbaki baliogabea" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Jabe baliogabea" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Grabazio tamaina baliogabea" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Grabaszio tamaina %d-ren multiplo bat izan behar da." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Elementu kopuru baliogabea" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "--to-command aukera bat bakarrik onartzen da" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Gaizki eratutako dentsitate argumentua: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Dentsitate Ezezaguna: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FITXATEGIA]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "`%c' zaharkituriko aukerak argumentu bat behar du" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Pakete fitxategi anitzentzat `-M' aukera erabili behar da" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Ezin dira --listed-incremental eta --newer batera erabili" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Ezin dira bolumen-anitzeko paketeak egiaztatu" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Ezin dira konprimituriko fitxategiak egiaztatu" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Ezin dira bolumen anitzeko konprimituriko paketeak erabaili" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Ezin dira konprimituriko paketeak kateatu" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr " `-Aru' aukerak bateraezinak dira `-f -' rekin" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Behintzat `-Acdtrux' aukeretako bat ezarri behar duzu" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Errore irteera aurreko erroreak direla eta" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2244,81 +2288,81 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "" msgstr[1] "" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "%s gakoa ezezaguna da edo ez dago inplementaturik oraindik" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "%s patroia ezin da erabili" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "%s gakoa ezin da gainidatzi" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Gaizki eratutako buru luzapena: luzera falta da" -#: src/xheader.c:506 +#: src/xheader.c:504 #, fuzzy msgid "Extended header length is out of allowed range" msgstr " %*s buru luzapen luzera eremuz kanpo dago" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr " %*s buru luzapen luzera eremuz kanpo dago" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Gaizki eratutako buru luzapena: luzera ondoren hutsunea falta da" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Gaizki eratutako buru luzapena: berdin ikurra falta da" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Gaizki eratutako buru luzapena: lerro berria falta da" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "alde batetara utzi gako buru luzapen ezezaguna `%s'" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Gaizki eratutako buru luzapena: baliogabea %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Gaizki eratutako buru luzapena: gehiegizkoa %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Gaizki eratutako buru luzapena: %s baliogabea: %c mugatzaile esperodageba" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Gaizki eratutako buru luzapena: %s baliogabea: balio kopuru bitxia" @@ -2484,103 +2528,117 @@ msgstr "Inodo zenbakia eremuz kanpo dago" msgid "Negative size: %s" msgstr "Tamaina baliogabea: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) -ek huts egin du" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Errorea zenbakia analizatzean hemendi gertu: `%s'" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Data formatu ezezaguna" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARG...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "Ezin da `%s' ireki" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "%s: Ezin da %s-ra seek egin" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "fitxategia izenak karaktere baliogabea du" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "ezin dira sakabanaturiko fitxategiaksortu irteera estandarrean. --file " "erabili" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "maskara baliogabea (`%s'-etik gertu)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "`%s' eremu ezezaguna" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "ezin da `%s'-ren denbora ezarri" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Komandoa behar bezala irten da\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Komandoa %d egoerarekin huts egin du\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Komandoa %d seinalearekin amaitu da\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Komandoa %d seinalearekin geratu da\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Komando iraulketa nagusia\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Komandoa amaitua\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat -ek fitxategi izenak behar ditu" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "argumentu gehiegi" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "--delay-directory-restore aukeraren eragina ezeztatu" + #~ msgid "block size" #~ msgstr "bloke tamaina" @@ -2627,3 +2685,6 @@ msgstr "argumentu gehiegi" #~ msgid "[.]NUMBER" #~ msgstr "[.]ZENBAKIA" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Errore irteera aurreko erroreak direla eta" diff --git a/po/fi.gmo b/po/fi.gmo index d21c46fff9da7fe2675379a0db9102b66db505d0..65b2580098c0897295173bf13975bb7390197b20 100644 GIT binary patch delta 7865 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 F{{qH{qSgQa delta 8064 zcmZA6d0f|3zQ^$cuEeS$2q=C*MFkWTH&D@BP;tqvEW!o!r=qgR4@pz|x#W_XrRY?X z&WuLgd92&FjrMbN{&CM<1T&obPhZ`JD6pqIT?= z;LUr31E02RyxnkA1sT&8UkWwm2g-%9YBi=ydt>6TE5_hZY>EZwVG;75S;dbq-0j?l z>!`nkx^I|gOn1E7xdA&F6EH_8wBW>Nn2c9&1V$$r(-8|X99N^}tieRA#T5EC^%SCMxPUqMEApSo>0nGBoQl(M8>)jJP#r`t zx;E%xSIkCbU?$GO3QWiMQ3DBPx;-%-d*E2?MgJy1foGcMuo%yvQr17kj&vecQ(uT0 z*f*Gqp`C3#AG4^JqGq@YHNyj_j!vVV->8c*B*}EfzBmd4T9cI&G=u$^k7rS9-ib!t zFbGvILdIs6qGq-W+uY z5=POjiDdYCKRwil`=B<*ov6*W0@dMDsE!Ufzd&^m)yt-~HLBybsHGZ!EwBiSf{gJa zeVX@K4^6Z=?{;gw|0xvI!2nby#^7KqK@F%5L-B2Q{tULFehsymLU@-nfh3H^zS!^_ z)I>^9Dc^z-_&n-6@+yYYzxj-U9{3%S5);(V)>~pr>M5uZXQO5~1shV1>bMp)z@w-E zoJ8&Vk5GH(2J%Lm>}>m57Nei~!x+#58nflqaXf0R(oi$#huY1zqf)&BwTsuFHq|E7 z{fDs)oEcT^e3!c3fkx_^Ct^3T39&(WaNoJYM4*U-aXP%}v!U%A#{y>9nJd9e3w@@?v z3={A?YKFn&QynItGSvfhe=ceOcc5mr67_mMi`rX%LuK$wyqnGVEowl+1B2}h=c8t} z0o740Y9Pl@4?2zPH**~|vy5BWsMsHM-+I)*cB2M#7?t|>P!stIAH|D!2d)`n&j&uH zpcGxf3``zsmtZ1l<^>po)tHD6;xK#$HNY#Fg-vMWBWJQP1m`*{u?h8M&Q%yheLW7> z`@eyL*5W;Ei`P-9Y0X)6*dMjq3s4=d!%p}(s>4^1uduo7Ow8l=0`)PdB{`0_;J2vf z{fO$P)d=0k`e#y5%BEpBR--z+AC9&2ZwjLOtFY`7m& zbwBF*Js5>=pgzfGF&!_CCI3oA+&DXcA=sJveC&!fn1;ttGx-*^%Oh^1Lv~R|)LzIQ zZcOk98}36*@DtPkgC^ML#-N@%ctXJL?gcbx#;Z}g{Sgesy{Na~DC(ET2iO8b zCfe6B0UJI@7)g5}Y7Z>HCb$Ee;%?M)_h3srf!*=10SX#%@Fe?7Cj+&~Do``7L9Ov& zS3iqN>93fH?I+t^JsxQ?<+zE=)T1&po|m0B+f-vSJc4@eE6%`q3K2AfPO&45$6D$= zP_N4e*c-2*)->%-yHs~zEcE~?#g8C;nio+^7j>5%cn&Hfg_w(*P!oO&2kZU6PC;vx zU0_o)2bG$8Q8U=%+TTTG=A3J9a<|e~%+=)J0NjT9^QSpYLA&}UYR1t;cFl57Z^LrbTk<3-g{LqF!;9_tkvNxn1$y`) zYN>9xdZ(E-<$0)q_)$x=3j=!aTkgbkqBv+?&n@;{8ihcswriL?15F-}Dd>~U24tC)<9=GYEWP!H&i zx__?oSyXDTq6UybS~TN4)WoV#=bu1U(R@Ca{PS%vxh%X=`VeY_Z(<+(5}RVeJiE)2 zQ3K3Fwcn4;a3eOy8jQyssJGz-Y=>dCPWVzG3Dx_QybnGJE56R0ow9f{(fO zC$JIqL+IgA)LMRo`VwA5W$Gp>Gri00!2B3V{dYJB_oBWdm#{H*tZ4W`22589N?8VW z!+g}*Eyl_qmITL953aNylnJP}#gAe504l}5!BO}ersGZ2MAH0rV!cuCeV;b(>NYaqBdo0wf!DUM4HTY^f2@uyAYyIA zcg~?QcOLs-@V$1T+4qwFo-|CMK^JVmP<#q|;Q>?%zee2{xzx@u54AKEsE%qd8xNo| zaS^-YPpG9#S!S1HEb9C$)Wpk|k^kNlw$Y%OzKPm|H!%{^m)rMz0RF^g9Eu+8{kbm< z3o!}TJL^ybdK)!>f8ubAUtu@n44h1T9%^7O2Ph;^IFDNU;FVSnwR>}MCyqqE&gML} z#r#!vZ_GhWU^nXeGpIdq4wbpE)%FwK3kOjzKn?J>I2Z#*+=&~gO_Fmz>x)CN8BTEC zg^j2eVLtj$OSB)=(O1|3!`Ijh^*}AjM2yBwsOxrNCcc4e#(=p&p)U=oYkAkP7(3xr z)LOM!XJ4}p=uyu_J$O3C;A5x(@5dxOj>^#IsLlBcDzg#mxd+ox1KouB`={AYVK@yJ zQLjhO2W&^hIF|Zq)FwTR+9QoO*get@wZ^ki1Ky6E@kQ*4Utk*y-)JY0f*$o-Q3EK( zWcoL2Dd+)vP&0TJ^#!|vTHC};cC$@JZO#>_f$l|h^eM(;^9Su8Vmn|z>U~j}sz42_ z4%6^2I1+DSAdbR_&GvOD!gT6uQSApY0^dP>pgzX#_&utFMAl1dIR(4ndhCIRT>Cee zNS`+XMmz!qC=CWc@~>a(y5K7fPp04lXtu{DO) z*taMN!>JEMWpp%V;X;hXCvgBCLv6|%HRN9ph}>p>dv(H4>N7D6%dsaeLp@+04#n3{ znF!r(U!xpUeJN@Q>zr?+?!Sb}Oww=cmvj<()E`f$FoD8LNM;&d!8!P!!=rH&mFBpx zW@>C~KnYY1{&P&E9!xZH4Zp=6)Eg7mDfdAiCZi6$3p$FZ^I0`-5=q1(M3lScHp(3- zA3+`0EG8+41$&#yICtS_cY=I29JBcOlq+j%GVO+cZqRD~H^D3$j;Z|o#Fe}7tO4$M zQ*kowT7%aJE#`E0t`$D07dD2*Y%1M}uP8Ue$M8!+M=#=bqJ;Pt(TZ3>gmYaGp&jrZ zQBM5-;|2|bxJHK-?iE4{`#;3bM7p-&5+cD}q!;gH!XtJO+9f)6)WpRljOxTy$<(Td zM~PZO$McqkKfJ2=De-sLHrx5X&X4d!&GNXckbbVu`kEtg3GG@_8}F|99cmjrLky<< zWX+YhR)PK0vZ#HJZxQDR9e&zM2_65mm`a>M{6ypsR|p+^#LO(Ny^1Y}KM~W27m2yF z=eXxoU^&sBIL$c@`)_+H9oG+cVIPY6pG|+pJ6u}`<=b63jOG?g8AEHBMf&Jsb!uk7u(bS_p_I4ABrWe z+zrQYMH74-TjFqc#}Idos&^9Si59M{uRay;(=d~Ghv-OLASQ9a7kHV_KZTyb45Ek_ zM*T_DvCY!(a}@0(2_0LBCPXatTZz?_cM=~HzY>|WjU_(Q{MXPBM$Dukl4wU9ram8^ z#=D7!i4Tb(#3@2Y4Cf~hI^vyOaVYiPL}$teb&_KQXV(fIY;S&y+i>q$2GQ8 zqdVHub{FMDB8nJIy^I(^`M-!fLYwHjn&FAhcAPN_`%s@!jYm-Cb`XOR2zKZe^ zf7PPWk}_YJH?Mqd)uKgSQOW$G62Gsslru&4DoXXW2j3~X5Scc)zP7Z!)+?%\n" "Language-Team: Finnish \n" @@ -80,7 +80,7 @@ msgstr " [VALITSIN...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Komennot ”%s --help” ja ”%s --usage” antavat lisää tietoa.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen %s.\n" @@ -89,15 +89,15 @@ msgstr "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen %s.\n" msgid "Unknown system error" msgstr "Tuntematon järjestelmävirhe" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "näytä tämä ohje" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "näytä lyhyt käyttöohje" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NIMI" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "näytä ohjelman versio" @@ -132,7 +132,7 @@ msgstr "%s: Liian monta argumenttia\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -191,16 +191,16 @@ msgstr "%s: valitsin ”-W %s” on moniselitteinen\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "muisti lopussa" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Työhakemistoa ei voi vaihtaa" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Työhakemistoa ei voi tallentaa" @@ -322,11 +322,23 @@ msgstr "”" msgid "'" msgstr "”" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[kKyY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[eEnN]" @@ -529,104 +541,104 @@ msgstr "Ennenaikainen tiedoston loppu" msgid "Garbage command" msgstr "Roskakomento" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Tämä ei näytä tar-arkistolta" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Kirjoitettuja tavuja yhteensä" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Poistettuja tavuja yhteensä: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(putki)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Virheellinen arvo kentälle record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Arkiston nimeä ei ole annettu" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Vakiosyötteessä/tulosteessa olevaa arkistoa ei voi varmistaa" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arkisto on tiivistetty. Käytä valitsinta %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Pakattuja arkistoja ei voi päivittää" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Nauhan alussa, lopetetaan" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Liian monta virhettä, lopetetaan" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ei pysähtynyt tietueen rajalle" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sisältää virheellisen arkiston osan järjestysnumeron" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Arkisto-osan järjestysnumeron ylivuoto" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Valmistele osa #%d arkistolle %s ja paina return: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Tiedoston loppu odotetun käyttäjän syötteen sijaan" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "VAROITUS: Arkisto on epätäydellinen" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -638,66 +650,67 @@ msgstr "" " q Keskeytä tar\n" " y tai rivinv. Jatka suoritusta\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Käynnistä alikuori\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Näytä tämä lista\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Ei uutta arkiston osaa, poistutaan.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Tiedostonimeä ei annettu. Yritä uudelleen.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "Komento %s epäonnistui" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s ei jatku tällä arkiston osalla" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s on väärän kokoinen (%s ≠ %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tämä arkiston osa ei ole järjestyksessä" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkistoa ei ole nimetty täsmää nimiöön %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Arkiston osa %s ei täsmää nimiöön %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -705,6 +718,11 @@ msgstr "" "%s: tiedostonimi on liian pitkä tallennettavaksi moniosaisen GNU-arkiston " "otsakkeeseen; nimi typistetty" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek ei pysähtynyt tietueen rajalle" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -716,8 +734,8 @@ msgstr[1] "Voitiin lukea vain %lu tavua %lu tavusta" msgid "Contents differ" msgstr "Sisällöt eroavat" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Odottamaton tiedoston loppu arkistossa" @@ -835,7 +853,7 @@ msgstr[1] "%s: Tiedosto kutistui %s tavun verran, tasataan nollilla" 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -864,7 +882,7 @@ msgstr "%s: tiedosto on arkistossa, ei lisätä" msgid "%s: File removed before we read it" msgstr "%s: Tiedosto oli poistettu ennen sen lukemista" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 #, fuzzy msgid "directory not dumped" msgstr "%s: näyttää välimuistihakemistolta, ei lisätä" @@ -916,169 +934,169 @@ msgstr "%s: Hakemisto nimettiin uudelleen ennen kuin sen tilaa voitiin purkaa" msgid "Extracting contiguous files as regular files" msgstr "Puretaan jatkuvat tiedostot normaaleiksi tiedostoiksi" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Yritetään purkaa symboliset linkit koviksi linkeiksi" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Luetaan %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ei voi purkaa -- tiedosto on jatkoa toisesta arkiston osasta" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Odottamaton tiedoston loppu sovitetuissa nimissä" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tuntematon tiedostotyyppi ”%c”, purettiin normaaliksi tiedostoksi" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Nykyinen %s on uudempi tai yhtä vanha" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tätä tiedostoa ei voitu varmuuskopioida" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Uudelleennimeäminen nimelle %s ei onnistu" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Virhe ei ole korjattavissa, poistutaan nyt" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Hakemisto %s on nimetty uudelleen" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Hakemisto on nimetty uudelleen" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Hakemisto on uusi" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Virheellinen aikaleima" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Virheellinen muutosaika (sekunnit)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Virheellinen muutosaika (nanosekunnit)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Virheellinen laitenumero" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Virheellinen i-solmun numero" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Odottamaton tiedoston loppu arkistossa" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Kelvoton tiheysargumentti: ”%s”" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Kelvoton tiheysargumentti: ”%s”" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Väliaikaishakemiston luominen %s-mallia käyttäen ei onnistu" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ei poisteta hakemistoa: stat ei onnistu" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: hakemisto on eri laitteella, ei poisteta" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Poistetaan %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei voi poistaa" @@ -1098,19 +1116,19 @@ msgstr "lohko %s: ** NUL-lohko **\n" msgid "block %s: ** End of File **\n" msgstr "lohko %s: ** Tiedoston loppu **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "lohko %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1118,70 +1136,70 @@ msgstr "" "kahden komplementiksi" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkisto sisältää käytöstä poistuvia base-64-otsakkeita" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " linkki tiedostoon %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " tuntematon tiedostotyyppi %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Pitkä linkki--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Pitkä nimi--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Arkiston osan otsake--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Jatkuu tavusta %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Luodaan hakemisto:" @@ -1219,24 +1237,24 @@ msgstr "prosessienvälinen kanava" # ... ja sen pitää päätyä kääntäjien ongelmaksi? #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Tiedostonimissä on käytetty jokerimerkkejä. Käytä" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "valitsinta --wildcards täsmäyksen käyttöön ottamiseksi, tai" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "--no-wildcards tämän varoituksen vaientamiseksi." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ei löytynyt arkistosta" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Vaadittua esiintymää ei löytynyt arkistosta" @@ -1262,7 +1280,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1280,7 +1298,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:343 +#: src/tar.c:345 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 " @@ -1301,86 +1319,86 @@ msgstr "" " muuten yksinkertaisia\n" " never, simple tee aina yksinkertaisia varmuuskopioita\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Päätoimintatila:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "listaa arkiston sisältö" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "pura tiedostoja arkistosta" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "luo uusi arkisto" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "etsi arkiston ja tiedostojärjestelmän väliset erot" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "lisää tiedostoja arkiston loppuun" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "lisää vain arkistokopiota uudemmat tiedostot" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "lisää tar-tiedostoja arkistoon" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "poista tiedostoja arkistosta (ei toimi magneettinauhoilla!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Toimintovalinnat:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "käsittele harvat tiedostot tehokkaasti" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "käsittele vanha GNU-muotoinen lisääntyvä varmuuskopio" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "TIED" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "käsittele uusi GNU-muotoinen lisääntyvä varmuuskopio" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "jatka lukukelvottomista tiedostoista huolimatta" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "MÄÄRÄ" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1393,299 +1411,299 @@ msgstr "" "annettu komentirivillä tai -T-valitsimella; oletusMÄÄRÄ on 1" # Muualla seek on siirtymistä... -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "arkisto on selattava" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "yritä varmistaa arkisto kirjoittamisen jälkeen" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "poista tiedostot arkistoon lisäämisen jälkeen" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "älä korvaa olemassaolevia tiedostoja purettaessa" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "älä korvaa olemassaolevia tiedostoja, jotka ovat arkistokopioitaan uudempia" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "ylikirjoita olemassaolevat tiedostot purettaessa" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "poista jokainen tiedosto ennen sen päälle purkamista" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "tyhjennä rakenne ennen hakemiston purkamista" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "säilytä olemassaolevien hakemistojen metatiedot" -#: src/tar.c:445 +#: src/tar.c:447 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "ylikirjoita olemassaolevat tiedostot purettaessa" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Valitse tulostusvirta:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "pura tiedostot vakiotulosteeseen" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMENTO" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "putkita puretut tiedostot toiselle ohjelmalle" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "jätä lapsiprosessien paluuarvot huomiotta" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "käsittele lapsiprosessien nollasta poikkeavat paluuarvot virheinä" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Tiedostojen ominaisuuksien käsittely:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "pakota NIMI lisättyjen tiedostojen omistajaksi" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "pakota NIMI lisättyjen tiedostojen ryhmäksi" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "PÄIVÄYS-TAI-TIED" -#: src/tar.c:472 +#: src/tar.c:474 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "tallenna vain PÄIVÄYS-TAI-TIEDostoa uudemmat tiedostot" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "MUUTOS" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "pakota (symbolinen) tila MUUTOS lisätyille" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "älä pura tiedoston muutosaikaa" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "yritä purkaa tiedostot samalla omistajuudella" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "pura tiedostot itsenäsi" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "käytä aina numeroita käyttäjän/ryhmän nimissä" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "lajittele purettavat tiedostonimet täsmäämään arkistoon" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "sama kuin -p ja -s yhdessä" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 #, fuzzy msgid "Device selection and switching:" msgstr "Laitteen valinta ja vaihtaminen:\n" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARKISTO" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "käytä arkistotiedostoa tai -laitetta ARKISTO" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "arkisto on paikallinen vaikka nimessä olisi kaksoispiste" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "käytä rmt-KOMENTOA rmt:n sijaan" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "käytä etäKOMENTOa rsh:n sijaan" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "anna asema ja tiheys" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "luo/listaa/pura moniosainen arkisto" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "vaihda nauhaa MÄÄRÄ × 1024 kirjoitetun tavun jälkeen" -#: src/tar.c:539 +#: src/tar.c:541 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:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "käytä/päivitä arkiston osan numero TIEDostossa" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Laitteen lohkot:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "LOHKOT" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "LOHKOT × 512 tavua tietuetta kohti" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "MÄÄRÄ tavua tietuetta kohti, 512:n monikerta" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "älä huomioi nollattuja lohkoja arkistossa (merkitsee tiedoston loppua)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "suorita lohkominen uudelleen luettaessa (4.2BSD-putkia varten)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Arkistomuodon valinta:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "MUOTO" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "luo annetun muotoinen arkisto" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "MUOTO on yksi seuraavista:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "vanha V7-tar-muoto" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "GNU-muoto tar-versioilla ≤ 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x -muoto" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) -muoto" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) -muoto" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "sama kuin pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "sama kuin --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "sama kuin --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "avainsana[[:]=arvo][,avainsana[[:]=arvo]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "määrittele pax-avainsanoja" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEKSTI" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1693,179 +1711,192 @@ msgstr "" "luo arkisto nimiöllä TEKSTI. Listattaessa/purettaessa käytä TEKSTIä " "nimiönhakulausekkeena" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Ristiriitaiset pakkausvalitsimet" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "ohjaa arkisto bzip2-ohjelman läpi" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "ohjaa arkisto gzip-ohjelman läpi" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "ohjaa arkisto compress-ohjelman läpi" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "ohjaa arkisto gzip-ohjelman läpi" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "ohjaa arkisto gzip-ohjelman läpi" + +#: src/tar.c:613 msgid "PROG" msgstr "OHJ" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "ohjaa OHJelman läpi (on hyväksyttävä -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Paikallisten tiedostojen valinta:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "HAK" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "siirry hakemistoon HAK" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "hae purettavat/luotavat nimet TIEDOSTOsta" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T lukee nollaan päättyviä nimiä, poistaa käytöstä -C:n" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "HAHMO" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "jätä pois HAHMOn mukaiset tiedostot" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "jätä pois TIEDOSTOssa listatut hahmot" -#: src/tar.c:631 +#: src/tar.c:640 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "jätä pois välimuistihakemistot" -#: src/tar.c:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "estä automaattinen eteneminen alihakemistoihin" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "pysy nykyisessä tiedostojärjestelmässä arkistoa luotaessa" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "etene alihakemistoihin (oletus)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "älä poista ”/”-merkkiä tiedostonimien alusta" -#: src/tar.c:656 +#: src/tar.c:665 #, fuzzy msgid "follow symlinks; archive and dump the files they point to" msgstr "seuraa symlinkkejä; " -#: src/tar.c:658 +#: src/tar.c:667 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "seuraa symlinkkejä; " -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "TIED-NIMI" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "aloita arkiston tiedostosta TIED-NIMI" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "tallenna vain PÄIVÄYS-TAI-TIEDostoa uudemmat tiedostot" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "PÄIVÄYS" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "vertaa vain tiedoston muutosaikaa" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "HALLINTA" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "varmuuskopiointi ennen poistoa, valitse versionHALLINTA" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "MERKKIJONO" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1873,95 +1904,95 @@ msgstr "" "varmuuskopiointi ennen poistoa, älä käytä tavanomaista jälkiliitettä (joka " "on ”~”, ellei muuttujaa SIMPLE_BACKUP_SUFFIX ole asetettu)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "poista MÄÄRÄn verran osia tiedostonimien alusta" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 #, fuzzy msgid "ignore case" msgstr "poisjättäminen ei huomioi kirjainkokoa" -#: src/tar.c:689 +#: src/tar.c:699 #, fuzzy msgid "patterns match file name start" msgstr "poisjättöhahmoja verrataan nimen alkuun" -#: src/tar.c:691 +#: src/tar.c:701 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "poisjättöhahmoja verrataan jokaisen ”/”:n jälkeen" -#: src/tar.c:693 +#: src/tar.c:703 #, fuzzy msgid "case sensitive matching (default)" msgstr "poisjättäminen huomioi kirjainkoon (oletus)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "poisjättöhahmon jokerimerkit eivät täsmää ”/”-merkkiin" -#: src/tar.c:701 +#: src/tar.c:711 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "poisjättöhahmon jokerimerkit vastaavat merkkiä ”/”" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Tietoja antava tuloste:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "listaa käsiteltävät tiedostot" -#: src/tar.c:711 +#: src/tar.c:721 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "näytä edistymisviesti 10 sekunnin välein" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "näytä viesti, ellei kaikkia linkkejä lisätty" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1969,58 +2000,58 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "näytä tiedostojen muutosajat UTC-aikoina" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "ohjaa monisanainen tuloste TIEDostoon" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "näytä lohkonumero arkistossa viestien yhteydessä" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "kysy varmistusta jokaiselle toiminnolle" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "näytä tarin oletukset" -#: src/tar.c:735 +#: src/tar.c:745 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:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Yhteensopivuusvalitsimet:" -#: src/tar.c:753 +#: src/tar.c:763 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" @@ -2028,57 +2059,57 @@ msgid "" msgstr "" "luotaessa sama kuin --old-archive purettaessa sama kuin --no-same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Muut valitsimet:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "poista käytöstä joitakin potentiaalisesti vahingollisia valitsimia" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Vain yhtä valitsimista ”-Acdtrux” voi käyttää kerrallaan" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Ristiriitaiset pakkausvalitsimet" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Tuntematon signaalin nimi: %s" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Päiväystiedostoa ei löytynyt" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Korvataan tuntematon päiväysmuoto %2$s arvolla %1$s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Valitsin %s: Käsittellään päiväys %s arvona %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: tiedosto on arkistossa, ei lisätä" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: tiedostonimi sisältää nul-merkin" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Kelvolliset argumentit --quoting-style -valitsimille ovat:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2086,151 +2117,165 @@ msgstr "" "\n" "*Tämä* tar käyttää oletuksena:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Virheellinen lohkomiskerroin" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Varoitus: valitsin -I ei ole tuettu, ehkä tarkoitit -j tai -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Virheellinen nauhan pituus" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Annettu useampi kuin yksi kynnyspäiväys" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ei ole tuettu tällä alustalla" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Virheellinen ryhmä" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Valitsimelle annettiin virheellinen tila" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Virheellinen määrä" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Virheellinen omistaja" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Virheellinen tietueen koko" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Tietueen koon on oltava %d:n monikerta." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Virheellinen osien määrä" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Kelvoton tiheysargumentti: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Tuntematon tiheys: ”%c”" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[TIEDOSTO]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Vanha valitsin ”%c” vaatii argumentin." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "valitsin --occurence on merkityksetön ilman tiedostoluetteloa" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "valitsinta --occurence ei voi käyttää pyydetyssä toimintatilassa" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Usean arkistotiedoston käyttäminen vaatii valitsimen ”-M”" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Valitsimia --listed-incremental ja --newer ei voi käyttää yhdessä" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Moniosaisia arkistoja ei voi tarkastaa" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Pakattuja arkistoja ei voi varmistaa" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Pakattuja moniosaisia arkistoja ei voi käyttää" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Pakattuja arkistoja ei voi liittää toisiinsa" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "Valitsinta --pax-option voi käyttää vain POSIX-arkistoille" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Kieltäydytään pelkurimaisesti luomasta tyhjää arkistoa" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Valitsimet ”-Aru” eivät ole yhteensopivia valitsinten ”-f -” kanssa" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Vähintään yhtä valitsimista ”-Acdtrux” on käytettävä" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Viivästetty virhepoistuminen johtuu aikaisemmista virheistä" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2239,60 +2284,60 @@ 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:158 +#: src/xheader.c:156 #, 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:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Hahmoa %s ei voi käyttää" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Avainsanaa %s ei voi ohittaa" -#: src/xheader.c:498 +#: src/xheader.c:496 #, fuzzy msgid "Malformed extended header: missing length" msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" -#: src/xheader.c:506 +#: src/xheader.c:504 #, fuzzy msgid "Extended header length is out of allowed range" msgstr "" "Arkiston etumerkillinen base-64-merkkijono %s on sallitun %s-välin " "ulkopuolella" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "" "Arkiston etumerkillinen base-64-merkkijono %s on sallitun %s-välin " "ulkopuolella" -#: src/xheader.c:525 +#: src/xheader.c:523 #, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "Väärän muotoinen laajennettu otsake: tyhje puuttuu pituuden jälkeen" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" -#: src/xheader.c:539 +#: src/xheader.c:537 #, fuzzy msgid "Malformed extended header: missing newline" msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2300,28 +2345,28 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Väärän muotoinen laajennettu otsake: virheellinen %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, fuzzy, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Väärän muotoinen laajennettu otsake: virheellinen %s: odottamaton rajoitin %c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" @@ -2487,97 +2532,107 @@ msgstr "I-solmun numero ei ole sallitulla välillä" msgid "Negative size: %s" msgstr "Virheellinen koko: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) epäonnistui" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Tuntematon järjestelmävirhe" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARG...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "%s: Siirtyminen kohtaan %s ei onnistu" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "tiedostonimi sisältää nollatavun" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " tuntematon tiedostotyyppi %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Siirtyminen kohtaan %s ei onnistu" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Komennon suoritus päättyi onnistuneesti\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Lapsiprosessi kuoli signaalilla %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Komento keskeytyi signaaliin %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Komento pysähtyi signaaliin %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Komento keskeytyi\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Sovitetut tiedostonimet--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "liian monta argumenttia" @@ -2589,6 +2644,9 @@ msgstr "liian monta argumenttia" #~ msgid "[.]NUMBER" #~ msgstr "MÄÄRÄ" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Viivästetty virhepoistuminen johtuu aikaisemmista virheistä" + #~ msgid "%s: Read error at byte %s, reading %lu byte" #~ msgid_plural "%s: Read error at byte %s, reading %lu bytes" #~ msgstr[0] "%s: Lukuvirhe tavun %s kohdalla, luetaan %lu tavu" diff --git a/po/fr.gmo b/po/fr.gmo index 9781dcbeb76b7fd344ac53be1de815076885bbe5..0d6a80c96f7744aa9f36ee1e071a90aee3e6feb8 100644 GIT binary patch delta 9683 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 diff --git a/po/fr.po b/po/fr.po index f270aa1..0bb935c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,14 +1,15 @@ # Messages français pour GNU concernant tar. # Copyright © 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the tar package. # Michel Robitaille , jusqu'en 2004 # Christophe Combelles , 2007, 2008 # msgid "" msgstr "" -"Project-Id-Version: tar-1.19.90\n" +"Project-Id-Version: tar-1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2008-02-09 00:26+0100\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-04-14 22:07+0200\n" "Last-Translator: Christophe Combelles \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -81,7 +82,7 @@ msgstr " [OPTION...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Pour en savoir davantage, faites : « %s --help » ou « %s --usage ».\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Rapportez toute anomalie à %s.\n" @@ -90,15 +91,15 @@ msgstr "Rapportez toute anomalie à %s.\n" msgid "Unknown system error" msgstr "Erreur système inconnue" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "Afficher cette aide-mémoire" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "Afficher un court mode d'emploi" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NOM" @@ -111,11 +112,11 @@ msgstr "définit le nom du programme" msgid "SECS" msgstr "SECS" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "Bloquer pendant SECS secondes (3600 par défaut)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "Afficher la version du programme" @@ -133,7 +134,7 @@ msgstr "%s : trop d'arguments\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(PROGRAM ERROR) L'option devrait avoir été reconnue !?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "erreur d'écriture" @@ -192,16 +193,16 @@ msgstr "%s : l'option « -W %s » est ambiguë\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s : l'option « -W %s » ne prend pas d'argument\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "mémoire épuisée" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "Impossible d'enregistrer le répertoire de travail actuel" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "Impossible de revenir au répertoire de travail initial" @@ -324,11 +325,23 @@ msgstr "« " msgid "'" msgstr " »" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[oO]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -554,107 +567,107 @@ msgstr "Fin de fichier prématurée" msgid "Garbage command" msgstr "Commande rejetée" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Ceci ne ressemble pas à une archive de type « tar »" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Nombre total d'octets écrits" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Nombre total d'octets lus" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Nombre total d'octets effacés : %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(tube)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Valeur incorrecte pour « record_size »" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Aucun nom d'archive donné" -#: src/buffer.c:503 +#: src/buffer.c:522 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:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "L'archive est compressée. Utilisez l'option %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Une archive compressée ne peut pas être mise à jour" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Début de la cartouche atteinte ; arrêt du programme." -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Trop d'erreurs, arrêt du programme." -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ne s'est pas arrêté à une limite d'enregistrement" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s : contient un numéro de volume non valable" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Débordement du numéro de volume" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 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:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "AVERTISSEMENT : l'archive est incomplète" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -665,66 +678,67 @@ msgstr "" " q Arrêter tar\n" " y ou newline Continuer le traitement\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Générer un sous-shell\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Afficher cette liste\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Pas de nouveau volume ; fin du traitement.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Nom de fichier non spécifié. Essaye encore :).\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, 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:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "Échec de la commande %s" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "La suite de %s n'est pas sur ce volume." -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s a une taille incorrecte (%s != %s + %s)." -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ce volume est hors séquence." -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Archive non étiquetée pour correspondre à %s." -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Le volume %s ne correspond pas à %s." -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -732,6 +746,11 @@ msgstr "" "%s : nom de fichier tronqué, car trop long pour être stocké dans un en-tête " "GNU multi-volumes" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek ne s'est pas arrêté à une limite d'enregistrement" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -743,8 +762,8 @@ msgstr[1] "Seulement %lu octets sur %lu ont pu être lus" msgid "Contents differ" msgstr "Les contenus sont différents." -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fin prématurée rencontrée dans l'archive." @@ -868,7 +887,7 @@ msgstr "" "%s : le fichier est sur un système de fichiers différent ; fichier non " "archivé" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "contenu non archivé" @@ -897,7 +916,7 @@ msgstr "%s : le fichier est l'archive elle-même ; fichier non archivé" msgid "%s: File removed before we read it" msgstr "%s : fichier supprimé avant d'avoir été lu" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "répertoire non archivé" @@ -948,166 +967,166 @@ msgstr "%s : répertoire renommé avant l'extraction de son état" msgid "Extracting contiguous files as regular files" msgstr "Extraction des fichiers contigus comme des fichiers réguliers" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Tentative d'extraction des liens symboliques comme des liens physiques" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Lecture de %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "En-tête à nom long inattendu" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s : type de fichier inconnu « %c », extrait comme un fichier normal." -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Le %s actuel est au moins aussi récent" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s : impossible d'archiver ce fichier." -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Impossible de renommer %s en %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Erreur non récupérable : arrêt du traitement" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s : le répertoire a été renommé depuis %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s : le répertoire a été renommé." -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s : le répertoire est nouveau." -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Horodatage non valable" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Temps de modification non valable (secondes)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Temps de modification non valable (nanosecondes)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Numéro de périphérique non valable" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Numéro d'inode non valable" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Champ trop long rencontré pendant la lecture du fichier d'instantané" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Erreur de lecture du fichier d'instantané" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Fin prématurée du fichier d'instantané" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Valeur de champ inattendue dans le fichier d'instantané" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Terminaison de champ manquante" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Mauvais format de fichier incrémental" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Version non prise en charge pour le format incrémental : %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir incorrect : « %c » était attendu mais %#3o a été trouvé" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir incorrect : « X » en double" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir incorrect : nom vide dans « R »" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir incorrect : « T » non précédé de « R »" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir incorrect : nom vide dans « T »" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir incorrect : « X » n'a jamais été utilisé" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, 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:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s : répertoire non purgé : impossible d'évaluer par stat()" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s : suppression de %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s : suppression impossible" @@ -1127,20 +1146,20 @@ msgstr "bloc %s : ** Bloc de NULs **\n" msgid "block %s: ** End of File **\n" msgstr "bloc %s : ** Fin de fichier **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "bloc %s : " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1148,27 +1167,27 @@ msgstr "" "complément à 2 supposé" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "L'archive contient des en-têtes obsolètes en base 64." -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" @@ -1176,42 +1195,42 @@ msgstr "" "attendue." #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " lien vers %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " type de fichier inconnu %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Lien long--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Nom long--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--En-tête de volume--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Suite à l'octet %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Création du répertoire :" @@ -1248,28 +1267,28 @@ msgstr "canal inter-processus" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" "Caractères de correspondance de motif utilisé dans le nom de fichier. " "Veuillez " -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" "utiliser « --wildcards » pour activer la correspondance de motif ou « --no-" "wildcards » pour" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "supprimer cet avertissement." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s : non trouvé dans l'archive" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s : occurence requise non trouvée dans l'archive" @@ -1298,7 +1317,7 @@ msgstr "" "Type de protection de caractères inconnu « %s ». Essayez « %s --quoting-" "style=help » pour avoir une liste." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1319,7 +1338,7 @@ msgstr "" "manière détaillée.\n" " tar -xf archive.tar # Extrait tous les fichiers de archive.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1340,91 +1359,91 @@ 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:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Mode d'opération principal :" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "Afficher le contenu de l'archive" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "Extraire les fichiers de l'archive" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "Créer une nouvelle archive" -#: src/tar.c:379 +#: src/tar.c:381 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:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "Ajouter des fichiers à la fin de l'archive" -#: src/tar.c:384 +#: src/tar.c:386 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:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "Ajouter des fichiers tar à une archive" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "Effacer de l'archive (pas sur les bandes magnétiques !)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "Tester l'étiquette du volume d'archive et terminer" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Modificateurs d'opération :" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" "Économiser efficacement l'espace dans les fichiers dispersés (fichiers à " "trous)" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "MAJEUR[.MINEUR]" -#: src/tar.c:401 +#: src/tar.c:403 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:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "Prendre en charge les sauvegardes incrémentales à l'ancien format GNU" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FICHIER" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "Prendre en charge les sauvegardes incrémentales au nouveau format GNU" -#: src/tar.c:407 +#: src/tar.c:409 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:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NOMBRE" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1437,123 +1456,127 @@ msgstr "" "fichiers est fournie soit sur la ligne de commande, soit avec l'option « -T " "». NOMBRE vaut 1 par défaut." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "L'archive peut être parcourue" -#: src/tar.c:417 +#: src/tar.c:419 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:420 +#: src/tar.c:422 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:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Contrôle de l'écrasement :" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "Tenter de vérifier l'archive après écriture" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "Supprimer les fichiers après les avoir ajoutés à l'archive" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "Ne pas écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "Écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "Effacer chaque fichier préexistant avant l'extraction" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "Vider les hiérarchies avant d'extraire les répertoires" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "Préserver les métadonnées des répertoires préexistants" -#: src/tar.c:445 +#: src/tar.c:447 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:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Choix du flux de sortie :" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "Extraire les fichiers vers la sortie standard" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMMANDE" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "Renvoyer par tube les fichiers extraits vers un autre programme" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "Ignorer les codes de retour des processus enfants" -#: src/tar.c:460 +#: src/tar.c:462 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:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Traitement des attributs de fichiers :" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "Utiliser NOM comme propriétaire des fichiers ajoutés" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "Utiliser NOM comme groupe des fichiers ajoutés" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATE-OU-FICHIER" -#: src/tar.c:472 +#: src/tar.c:474 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:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "CHANGEMENTS" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" "Utiliser les CHANGEMENTS de mode (symboliques) pour les fichiers ajoutés" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "MÉTHODE" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1563,29 +1586,29 @@ msgstr "" "lecture (MÉTHODE = « replace » par défaut) ou en ne définissant pas les dates " "initialement (MÉTHODE = « system »)" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "Ne pas extraire la date de modification du fichier" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "Essayer d'extraire les fichiers avec le même propriétaire" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "Vous approprier les fichiers extraits" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "Toujours utiliser les valeurs numériques des utilisateurs/groupes" -#: src/tar.c:489 +#: src/tar.c:491 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:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1593,15 +1616,15 @@ msgstr "" "Appliquer l'umask de l'utilisateur lors de l'extraction des permissions (par " "défaut pour les utilisateurs normaux)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "Trier les noms à extraire dans le même ordre que l'archive" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "Équivalent à « -p -s » à la fois" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1609,139 +1632,139 @@ msgstr "" "Reporter à la fin de l'extraction le changement des dates de modification et " "des permissions des répertoires extraits" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "Annule l'effet de l'option « --delay-directory-restore »" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Sélection et option de périphérique :" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "Utiliser le fichier ou le périphérique ARCHIVE" -#: src/tar.c:513 +#: src/tar.c:515 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:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "Utiliser la COMMANDE rmt fournie au lieu de rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "Utiliser la COMMANDE distante à la place de rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "Spécifier le lecteur et la densité" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "Créer/lister/extraire une archive multi-volumes" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Changer de cartouche après avoir écrit NOMBRE x 1024 octets" -#: src/tar.c:539 +#: src/tar.c:541 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:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "Utiliser/mettre à jour le numéro de volume dans le FICHIER" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Blocs du périphérique :" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOCS" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCS x 512 octets par enregistrement" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NOMBRE d'octets par enregistrement (multiple de 512)" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Ignorer les blocs de zéros dans l'archive (càd EOF)" -#: src/tar.c:556 +#: src/tar.c:558 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:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Sélection du format d'archive :" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "Créer l'archive au format désiré." -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMAT peut prendre une des valeurs suivantes :" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "Vieux format tar V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "Format GNU issu de tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "Format GNU tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Format POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "Identique à pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "Identique à « --format=v7 »" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "Identique à « --format=posix »" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "mot_clé[[:]=valeur][,mot_clé[[:]=valeur]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "Mots-clés de contrôle pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEXTE" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1750,91 +1773,106 @@ msgstr "" "l'extraction, utiliser le TEXTE comme motif de correspondance (glob) au nom " "de volume." -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Options de compression :" -#: src/tar.c:594 +#: src/tar.c:596 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:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use 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:601 msgid "filter the archive through bzip2" msgstr "Filtrer l'archive à travers « bzip2 »" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "Filtrer l'archive à travers « gzip »" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "Filtrer l'archive à travers « compress »" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "Filtrer l'archive à travers « lzma »" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "Filtrer l'archive à travers « gzip »" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "Filtrer à travers le PROG (doit accepter l'option « -d »)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Sélection des fichiers locaux :" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "RÉP" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "Utiliser RÉP comme répertoire de travail" -#: src/tar.c:619 +#: src/tar.c:626 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:621 +#: src/tar.c:628 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:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" "Enlever la protection de caractères des noms de fichiers lus avec « -T » (par " "défaut)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" "Ne pas enlever la protection de caractères des noms de fichiers lus avec « -T " "»" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "MOTIF" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "Exclure les fichiers correspondant au MOTIF" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "Exclure les motifs listés dans le FICHIER" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1842,95 +1880,95 @@ msgstr "" "Exclure le contenu des répertoires contenant CACHEDIR.TAG, sauf le fichier " "de tag lui-même" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "Tout exclure dans les répertoires contenant CACHEDIR.TAG" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Exclure les répertoires contenant CACHEDIR.TAG" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "Tout exclure dans les répertoires contenant le FICHIER" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "Exclure les répertoires contenant le FICHIER" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "Exclure les répertoires de contrôle de version (CVS, .svn, etc.)" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "Empêcher la descente automatique dans les sous-répertoires" -#: src/tar.c:650 +#: src/tar.c:659 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:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "Parcourir les sous-répertoires de manière récursive (par défaut)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "Ne pas enlever le « / » au début des noms de fichiers" -#: src/tar.c:656 +#: src/tar.c:665 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:658 +#: src/tar.c:667 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "NOM-DE-MEMBRE" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "Débuter au NOM-DE-MEMBRE dans l'archive" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "Stocker seulement les fichiers plus récents que DATE-OU-FICHIER" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATE" -#: src/tar.c:665 +#: src/tar.c:674 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:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "CONTRÔLE" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" "Faire une copie de sauvegarde avant suppression, choisir le CONTRÔLE de " "version" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "CHAÎNE" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1939,100 +1977,100 @@ msgstr "" "habituel (« ~ » sauf s'il est définit par la variable d'environnement " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Transformation des noms de fichiers :" -#: src/tar.c:676 +#: src/tar.c:685 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:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:679 +#: src/tar.c:688 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:684 +#: src/tar.c:694 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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "Ignorer la casse (majuscules/minuscules)" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "Les motifs doivent correspondre au début des noms de fichiers" -#: src/tar.c:691 +#: src/tar.c:701 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:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "Correspondance sensible à la casse (comportement par défaut)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" "Utiliser des caractères de correspondance (par défaut pour l'exclusion)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "Correspondance exacte de chaîne" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "« / » ne correspond à aucun caractère de correspondance" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" "« / » peut correspondre à un caractère de correspondance (par défaut pour " "l'exclusion)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Options d'affichage :" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "Afficher de manière détaillée les fichiers traités" -#: src/tar.c:711 +#: src/tar.c:721 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:713 +#: src/tar.c:723 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "exécuter l'ACTION à chaque point de contrôle" -#: src/tar.c:717 +#: src/tar.c:727 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:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2044,27 +2082,27 @@ msgstr "" "sont : SIGHUP, SIGQUIT, SIGINT, SIGUSR1 et SIGUSR2. Les noms sans préfixe « " "SIG » sont aussi acceptés" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "Afficher les dates de modification de fichier en UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "Envoyer la sortie détaillée vers le FICHIER" -#: src/tar.c:728 +#: src/tar.c:738 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:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "Demander confirmation pour chaque action" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "Afficher les paramètres par défaut de tar" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2072,33 +2110,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:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "Afficher les noms des fichiers ou des archives après transformation" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "Protéger aussi les caractères faisant partie de la CHAÎNE" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "Enlever la protection des caractères faisant partie de la CHAÎNE" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Options de compatibilité :" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2106,56 +2144,56 @@ msgstr "" "Lors de la création, identique à « --old-archive ». Lors de l'extraction, " "identique à « --no-same-owner »" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Autres options :" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "Désactiver certaines options potentiellement néfastes" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Vous ne pouvez pas sélectionner plus d'une option parmi « -Acdtrux »" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Options de compression non compatibles entre elles" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Type de signal inconnu : %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Fichier d'échantillon de date non trouvé" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Remplacement par %s du format de date inconnu %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Option %s : date « %s » traitée comme %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s : la liste de fichiers est déjà lue" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s : le nom de fichier lu contient un caractère nul" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Les arguments valables pour les options « --quoting-style » sont :" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2163,112 +2201,118 @@ msgstr "" "\n" "Les valeurs par défaut de *ce* tar sont :\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Facteur de bloc non valable" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" "AVERTISSEMENT : l'option « -I » n'est pas prise en charge. Vous vouliez peut-" "être utiliser « -j » ou « -T » ?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Longueur de cartouche non valable" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Plus d'une date seuil" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Version de la dispersion non valable" -#: src/tar.c:1552 +#: src/tar.c:1585 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:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "la valeur de « --checkpoint » n'est pas un entier" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s : groupe non valable" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Mode non valable donné en option" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Nombre non valable" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Propriétaire non valable" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Taille d'enregistrement non valable" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Nombre d'éléments incorrect" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Une seule option « --to-command » est permise" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Argument de densité incorrect : %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Densité inconnue : « %c »" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FICHIER]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "L'ancienne option « %c » a besoin d'un argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence n'a pas de sens sans une liste de fichiers" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "« --occurrence » ne peut être utilisée dans le mode d'opération demandé" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Les fichiers d'archives multiples ont besoin de l'option « -M »" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Impossible de combiner « --listed-incremental » avec « --newer »" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2277,42 +2321,50 @@ msgstr[0] "" msgstr[1] "" "%s: l'étiquette du volume est trop longue (la limite est %lu octets)" -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Impossible de vérifier des archives multi-volumes" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Impossible de vérifier des archives compressées" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Impossible d'utiliser des archives multi-volumes compressées" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Impossible de concaténer des archives compressées" -#: src/tar.c:2293 +#: src/tar.c:2332 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:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 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:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Les options « -Aru » sont incompatibles avec « -f - »" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Vous devez choisir une des options « -Acdtrux » " -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Des erreurs ont provoqué l'arrêt du programme" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2321,52 +2373,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:158 +#: src/xheader.c:156 #, 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:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Le motif %s ne peut être utilisé" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Le mot clé %s ne peut pas être surdéfini" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "En-tête étendu incorrect : longueur manquante" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "La longueur de l'en-tête étendu est hors plage" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "En-tête étendu incorrect : espace blanche manquante après la longueur" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "En-tête étendu incorrect : signe d'égalité manquant" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "En-tête étendu incorrect : retour à la ligne manquant" -#: src/xheader.c:576 +#: src/xheader.c:574 #, 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:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2374,27 +2426,27 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "En-tête étendu incorrect : %s=%s non valable" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "En-tête étendu incorrect : %s=%s en trop" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, 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:1338 +#: src/xheader.c:1336 #, 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" @@ -2574,101 +2626,118 @@ msgstr "Nombre en dehors de la plage permise : %s" msgid "Negative size: %s" msgstr "Taille négative : %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "La fonction stat(%s) a échoué" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Erreur à la lecture du nombre près de « %s »" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Format de date inconnu" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGS...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "Impossible d'ouvrir « %s »" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "Impossible à parcourir" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "Le nom de fichier contient un caractère nul" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "Un fichier dispersé ne peut pas être généré sur la sortie standard. Utilisez " "l'option « --file »" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "Masque incorrect (près de « %s »)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Champ inconnu « %s »" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "Impossible de définir la date de « %s »" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "La commande s'est terminée correctement\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "La commande a échoué avec le code %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "La commande s'est terminée sur le signal %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "La commande s'est interrompue sur le signal %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "La commande a généré un core dump\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "La commande s'est terminée\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat nécessite un nom de fichier" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "trop d'arguments" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "Annule l'effet de l'option « --delay-directory-restore »" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Des erreurs ont provoqué l'arrêt du programme" + #~ msgid "[.]NUMBER" #~ msgstr "[.]NOMBRE" diff --git a/po/ga.gmo b/po/ga.gmo index c7a0128624841ea5eb14a547fd7649a84d712a36..0b48f034c457a4c9285f89fb9364fda504c23aa3 100644 GIT binary patch delta 13984 zcmb{22Xs``zQ^&C5L%>HsX254q|ieTy>~>hfRo82Gmy-{%p?@WK}3y;hz=kiDqIvn z#lnCfihvO;U_)s(1o7I?i(SO>zQ5TgPwu^M-K%T8v;60?_daLN?t4a;>$j9U^wMG10Oz(Obi^c9C9dTb9a~wKuN8wS=yN*Z^O}m+=#Ev zVq!;AfeTf^wRkZu!Bl(*H3Dy9E`ERviZw9O$+To9@{d)*AMRPtU>E!nTVV6fmX(7; zP(!^5)zCdyj3-bHo6Lv$;#^e4J5c4PkVmZYT}?-OpgtcNK|&S!P!-*S&2Tqr$WCH+ z`~?|Zs|(%Mi`_T^Z%3_#W2n!4=q4z*w#^suaQ*a+406r}Uk0Mz1~jScWRtVaFT%6Nh~ zLRIt>YSFxmT4d#!c;(w6%f!laT!9VA??(;gNoi!J{Q6i zEWzry5wmdzYVn;zy{Gj6^PWKiBIW~^QIN!qIjDU)AGL^X#fG>9ZQO)4@D;3!@1iRF z8d<+q&4H$8!!eos4Ad?tMs;Kjs$tLIL_827p_Zi#GIKWywasRu$~RyVzJ;2@W2g#G zpyv8_)Cja=MQJVc$Cg-vYWQZn7+=DgcoO-?`j$Vg1m?d7pW=+M?%`b3(7cA~*%?$z z6Nj0psD*UW%D`+4Vl#~4MR*uBWhYVF_&3y4br^2mmyOyLlbyUDnX-trh=k3JRj3#2 z#5Q;oTj1|l4O@&bJ?exy^GBm9xB@jL0o3OgIOX@Ew)2yyj=g{yxl^c-O&qC)G5;AP z^uocYo=ijy^)%F?%0tcFHP{|kqk6vI@l({0Cyz2_UHw<2-V=06HE_#BJ0=k zpyv8f)B&^`_4#-4BK#iJu!M=G1D&t~`O79U{+gQ`DbVWNjJ0qd*2ZI~2Ax5Tz}HUx zCnx_amZv;vlBqZuYm#q`8qq9NMdMKozYc9&hMKZ%5fU2e=TQwfg_`r9QA6135_80k z$Li$g;4Cabjo8nq1~!G~TLmg?Z48dT9`p6+%wn<4`FAl zc9q`C{0|_Zp$?*Yb{}dr??+9|=co#krhR0Y$qGOlu5k6II(9b?GMSWhFT zuJsIRdnZhzKI*sHlW2?+QFAvFo8k(*8n>YqQ9Uy1*+A5Dm!cXlA9Zd#>i7<7jZ|`( zwKNZt$v=pC?-Qu{UdKpR5@$&0Y;T@p7KsP728vO0w-B4*YE(tfI^~~ZfAWcLbAk>+ zHFN^1p%K)aM;$j}bMm`zI)3P8{M(Wknadu=Fls8^L4B|Sh1v~`P-|ca_QqoDi!oG% z-(V|D$urw)Fb*c4hr0hLs-EMh_ax>sde|vHV*Z8VRti+{A#8!ap(<+bH9sDwp+;aC zrr=Ykh8=P82|jbb88)DNAU46P(8gVx(IdfY{HLmH`YmDwX+41$nOlAwXqwu_&!E8q*6#D z7vWosgoe(I>e0=piq@cdydQOde1o;Ia@gdX;6>!Spw5SE)bm$j7M5Tg+>1T&2zJ7n zMP?BW!kW}?g-Nu=n^22qGgikJF$0fcd8}A$zJ#h`AM$lj4V!@aybo*PQcTD7sGc4| zP0jD9p>H?ae49?hh=ybtiSD=^HKhMQt z#WCdj;6z-ES~DM_M(8}MLv7|U{u;uxd3*yhXFX64{BjNdQ32atYt}%G`R44;LYwkz zR8L%}&)#_6c{--ep1EfEqUNbEzc_8JR0 zE-?#J68Kjr)QivDU>a0wk+B_irhI^tFUFQUzXbJs>_#)>$59Rc4*O%qP39NVEbKu( zvV%lJKKKpV6jUuSzuD4pJmpuTcEgriIF|7})S}vcs~O7Er~|3`ZDtpZM0F&9S$H>g z!#AA!6&ITkZ;v!6VvQl82bQ9G^de5i^JwFQ+s&`z5H=yd3Dv_Fo&1-miY{7WUOWi( zo_tjKJ*b|(jrv@*JIp!L1zT(X`$%Y;EyZTI2eqG1IsS$Wgw=2bKk^`rt~`TpdBJ(wcXf#nl@-k@un+b`Ms> z?Wl@(qh9zDjzcY=t}q@ovNxmdKZjlL2dstdmoff&urG;B45RW7;^p`*s>R)wn=hFn zOd-D>hhr(0$EqvL)YQhthV!OUe#)KK=q`dHw&2-UDP z*czWh?TU|4pU-&6oCCvAQ*#+6p&QjeFSeq7Yd#6RU_I)Eub}4ij2^(o8;t`no4gk_ zQkzf>JBO;c-6kr*Fm}dQQRN8_n;)|yQO}p4rub>pPju@n3AK3ABW4ZwF_rvX*chKh z4e@c*qWcBaldMP0BI<)}$PdEWSb&d2GJu5^F<@Km3S&!Psdr+(X9QMRIG4tG5WP4e&umj$X zy>Tb1p+BP5R;2A#GZbTRAq8_#Lw6o4VAE~URRd@&L zJ&&N)O8O4--w~#xMq)dDibs$|AF*~nZ4Q>dV@GZ@*lAuo67_)s)D+x?I$GDE2X|n7 zZ2F9;xEuB$KLIP@Vtfjhqkb8Ude(e?)-E%ZB{*FBe>;g}9!z-7e0fws4RKG@w!9Sk z;B}}9pT#ctHeQUCcbne<%~5miM|I=@Ov59n#g??k40$?gDkou+2#I16HEvkzP0>3xj9 zdYZi73{_ujM7{v0UR0ZpLC=@&UB*M$E(w z*c^{yb^ICYVDj5$#8Oa0Iu-T&a?HW~I0{n_oBPG6hHb{9+W+s7P|LO+F+KVa)zex> z%{h>bT@(0?hx%8t=rMCL#*UkccA}pD0^4GPcg)lbK#j~C)D*5odTc$98F&U8QNPvr zT{EXyXpJ!Sp_;zDdp{!7#vO8&^4 z{o}9>`6-xy=Lucam2s|x@pOd$+Cie2SVFu^+)3;t%C1XE3@09T$~xj|@}ux5v4V8@ zME-ESNqzwlC3O8Ar{iQIPX$~F&b{kMPon<#ziR2mY;Ne#(DgNuz)N!}DlPwF+(Ud%)aG9N|LGvTjChFrNa88d7hWGz7CFKnFHv^APWtY$4E~M$ zPediBY%$g)|1F`55w`j`Y32Lt57*6x_+O86{|r{7WGn6^zS90LyEsv;8_P0|AMsE% zC;d5INpKFu|Cfte+(KJCHJc-&Z7(39TbPRvIhxIq7|l;uIf#5MRZ^xL<`_uM)RXrfUPfg|FcA#A{CZY5bA$8F-SYs)xBgRR42` z#S~sgY$JU)&LwnJ#+jJmeOznv*>Kor#F(Q?Cme7CGJ;}YL#0FwJ;U#pf=H7SsHU3H* zAg(3)QuYh>!z+-J+d7NQ@e^#E!1&X__!V?4;{zUej?gt7Ct|I5j)h46GNJ|fm+&s^ zjrA~yx;WnB*8nH4|H`K8Wx`K1C5}fZ+(KMKgq#P)bK@XUcBMPzW%+g_nw4en4AGFd zpXZtqeGOnsO6eL-dIa{xO?W4q8cBFZj(DIKG{1L`>c*10j3vX4oRC6bAe#EZmZ+W)t4Q`ddOc+y>nFXAQU&qeT) zlh4IO?mvz{I-hHgHJ$r6pvy^%-?*2gxS;GHd0kmVcg_D7PC)~_mck@Pq6_XIblH?o zBlOLdhx&%p)sD2TRt9S&`J0KW$zSf=tA{pT~=FH$F_1CtY^E;G~aIu)|5;PkNG*);FfE>O>?)VQUg6h(m;~ z2b~8^j<7w3Xx81B>xcVyLSYkE1!5Tp5k|gQ`SoRzdo70 z+{nfr!~=w`d+|f!E+@YYdlJovE4Y6XF^%}fxlhvCNBSvZBk7gITcmCL8HWdCk;y$7qF^|~E%{@4gD7&U8O)uNSEu^EkDk17> zQJXom+B#1zBwdcsbq8g4;G;y2bAJ)Kh`&)b2CpU_A$}+7Qq~`JoxoKl8UK5`lb(TT z#988iQx=&*Vwv;7A4sb~W!DPIzalCTZ7J;MJohZ=cStwECQjKWq-PPj)>8I6u6ORm z3;9!p{4ggIGxoFICDFloumsCF=}MIQKVqgCv>ik->9V6okNnQH_M_;nsp*kXKDWmo z^4LSijVkWkzNbBO%q2?O#hzfu7x3Gi?Lg2jaD_cVySFzSp4l@aBi~1;tbJ+!2^0E{nKY$?&8Na%kL{Tg_V~m0Oi!@T7Y=)J z?VP!^ZgzTdY+LH4d){8X8WnvvI9R6a0&xbw&PSg@2`if9BbUdh}-={BO_v zr~Ci+Jw|y-AhvbN!K8jnqMhq0X8GCvqQV@8(Vp#PQrtn0E9~><+de)`Sgus&J0K~K0S=vT_;_l145X?7quL+#A<1wHO?AUHR=J@?LNTTiW|f_a6mXkX9N z@?KXk*N)!rX;Ufa$z$_{1F>bE*%cFAxv@%x1Cvr+IRzf`a(93y-9^EmHpaib*@`xE zHI3%a3Uzh{!VVSX<@x65v$-C&b)nDCi`ZK3!2hm#duA|@A9NMQ4$tb5SaUXO-ebl8 z+MZxA5R6t0H%jc38EqHtm)WsXTBq)IW@gVWUD{`M%FIk2H#ThobED0ZHi&bhr%h>A zT4tBDj$Q0d9b>D)o`lFik1Mxyr{5L&w{xe!+> zz3ItgN;enSIj&&oI+l^$e}X+=_@rU1eZMw<9bo2MxqPN{oq4-YLzwHagQc5%R8mm7 zIXyYqN{*g=*p4+V-czGN*b@l4e15;}Dsv4>{Ll4vEtA%rMHhAJuG(hZSIQ6dK3L%l44KY z)uddk(u%CaiC(X%V-#-^@3S1zf5V>>!^&BZ1$f6Wa^qbP}0y!Xb+4e1nZ zSQqxDF>`Kj5uKnzUPdkU=!VIaWA+m-RE*?%%_FW5Pxyk?M0b#8=P`Ks@$*n489xyJ z`Np3(5%tMj7ro_-X9{e;c9hSR%eMdHT@lstpI;WA%)iuxzwn8OPQO3h$3OSve}C$a zC({2Iia$o;kK6xzm+!>$+fOD{^E=ZTpR-`}?6cob(bDp0soO=qLN6NxdrPOyLUAWJ^q9V`la**k4n?=0nzH^55RnHoF2%Pu$U|Lg6s z-}by#u30WM`1xHDU-4RK`C1wm?v4X5bO)VDu7iTnO&$IZ24 z)Az@cs$a0nI9~$Mwg>uV{!1BE%yfmdKmB&De#8VqYClIop_=3N#+Dzbnp8o9U+9gk zdwpp61b=k<(iT<191nRqxN^N#wC~>j(bU83s$TH&(w)(%ho_Dx-5FvgbJ;7wLUwDA zo#RX$hYhDX-Bmq>fn2_!=yuszL6_Ox3@z2_Omcgp9~`b9J9PN+gny}}`_XevbG&&) zESC$a*D=Kb!IvMO9CoZ#lMC-L7W7+(acL}{iUQI82kJyuAFJCW6hAR?yp~Src*8?3 MyR0z!*s-Gj0rNS+_y7O^ delta 11468 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 diff --git a/po/ga.po b/po/ga.po index 88c2b49..489bbcd 100644 --- a/po/ga.po +++ b/po/ga.po @@ -1,13 +1,13 @@ # Irish translations for tar. # Copyright (C) 2003, 2004 Free Software Foundation, Inc. -# Kevin Patrick Scannell , 2003, 2004, 2006, 2007. -# +# This file is distributed under the same license as the tar package. +# Kevin Patrick Scannell , 2003, 2004, 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: tar 1.19\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2007-10-15 08:53-0600\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-04-14 21:53-0600\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "MIME-Version: 1.0\n" @@ -83,7 +83,7 @@ msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Bain triail as `%s --help' nó `%s --usage' chun tuilleadh eolais a fháil.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Seol tuairiscí fabhtanna chuig %s.\n" @@ -92,15 +92,15 @@ msgstr "Seol tuairiscí fabhtanna chuig %s.\n" msgid "Unknown system error" msgstr "Earráid anaithnid chórais" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "taispeáin an chabhair seo" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "taispeáin beagán eolais faoin úsáid" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "AINM" @@ -113,11 +113,11 @@ msgstr "socraigh ainm an chláir" msgid "SECS" msgstr "SOIC" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "moill de SOIC soicind (réamhshocrú: 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "taispeáin leagan an chláir" @@ -136,9 +136,9 @@ msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" "(EARRÁID RÍOMHCHLÁIR) Ba chóir aitheantas a thabhairt ar an rogha seo!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" -msgstr "" +msgstr "earráid sa scríobh" #: lib/getopt.c:526 lib/getopt.c:542 #, c-format @@ -195,19 +195,19 @@ msgstr "%s: Tá an rogha `-W %s' débhríoch\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "cuimhne ídithe" -#: lib/openat-die.c:33 -#, fuzzy, c-format +#: lib/openat-die.c:35 +#, c-format msgid "unable to record current working directory" -msgstr "Ní féidir an chomhadlann reatha a athrú" +msgstr "ní féidir an chomhadlann reatha a thaifeadadh" -#: lib/openat-die.c:46 -#, fuzzy, c-format +#: lib/openat-die.c:48 +#, c-format msgid "failed to return to initial working directory" -msgstr "Ní féidir an chomhadlann reatha a shábháil" +msgstr "níorbh fhéidir an bhunchomhadlann oibre a aisfhilleadh" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because @@ -332,11 +332,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[yYiIsS]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -367,7 +379,7 @@ msgstr "Ní féidir cianbhlaosc a rith" #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:65 msgid "(C)" -msgstr "" +msgstr "©" #: lib/version-etc.c:67 msgid "" @@ -378,24 +390,30 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Ceadúnas GPLv3+: GNU GPL leagan 3 nó níos nuaí \n" +"Is saorbhogearra é seo: ceadaítear duit é a athrú agus a athdháileadh.\n" +"Níl baránta AR BITH ann, an oiread atá ceadaithe de réir dlí.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:83 #, c-format msgid "Written by %s.\n" -msgstr "" +msgstr "Scríofa ag %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:87 #, c-format msgid "Written by %s and %s.\n" -msgstr "" +msgstr "Scríofa ag %s agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:91 #, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "" +msgstr "Scríofa ag %s, %s, agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -406,6 +424,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" +"Scríofa ag %s, %s, %s,\n" +"agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -416,6 +436,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Scríofa ag %s, %s, %s,\n" +"%s, agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -426,6 +448,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" +"Scríofa ag %s, %s, %s,\n" +"%s, %s, agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -436,6 +460,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" +"Scríofa ag %s, %s, %s,\n" +"%s, %s, %s, agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -447,6 +473,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" +"Scríofa ag %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -458,6 +487,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Scríofa ag %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, agus %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -469,6 +501,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"Scríofa ag %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, agus daoine eile nach iad.\n" #: rmt/rmt.c:142 msgid "Input string too long" @@ -539,68 +574,58 @@ msgstr "Comhadchríoch gan choinne" msgid "Garbage command" msgstr "Ordú dramhaíola" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Ní cosúil le cartlann `tar' é seo" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Bearta scríofa go hiomlán" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Bearta léite go hiomlán" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Bearta scriosta go hiomlán: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(píopa)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Luach neamhbhailí do record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Ní thugtar ainm na cartlainne" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Ní féidir cartlann stdin/stdout a fhíorú" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Is cartlann chomhbhrúite í seo. Úsáid an rogha %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a nuashonrú" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Tosach na téipe, ag scor anois" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "An iomarca earráidí, ag scor" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "Bloc neamhailínithe (%lu beart) sa chartlann" -msgstr[1] "Bloc neamhailínithe (%lu bheart) sa chartlann" -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:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -610,38 +635,48 @@ msgstr[2] "Méid taifid = %lu bhloc" msgstr[3] "Méid taifid = %lu mbloc" msgstr[4] "Méid taifid = %lu bloc" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "Bloc neamhailínithe (%lu beart) sa chartlann" +msgstr[1] "Bloc neamhailínithe (%lu bheart) sa chartlann" +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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "Níor stopadh rmtlseek ag teorainn taifid" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: tá uimhir imleabhair neamhbhailí ann" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Uimhir imleabhair thar maoil" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Fuarthas comhadchríoch in áit freagra ón úsáideoir" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "RABHADH: Tá an chartlann neamhiomlán" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -653,66 +688,67 @@ msgstr "" " q Tobscoir tar\n" " y nó líne nua Lean ar aghaidh\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Sceith fobhlaosc\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Priontáil an liosta seo\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Níl aon imleabhar nua; ag scor.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Ainm an chomhaid gan sonrú. Bain triail eile as.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ionchur neamhbhailí. Iontráil ? chun cabhair a fháil.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "Theip ar ordú %s" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "Ní leanann %s ar an imleabhar seo" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, 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:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tá an t-imleabhar seo as ord" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Lipéad ar chartlann nach comhoiriúnaithe le %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Níl an t-imleabhar %s comhoiriúnaithe le %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -720,6 +756,11 @@ msgstr "" "%s: ní féidir an comhadainm seo a stóráil i gceanntásc il-imleabhar GNU; " "teasctha" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "Níor stopadh rmtlseek ag teorainn taifid" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -734,8 +775,8 @@ msgstr[4] "Níorbh fhéidir ach %lu de %lu beart a léamh" msgid "Contents differ" msgstr "Tá difríocht idir na hábhair" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Comhadchríoch gan choinne i gcartlann" @@ -858,7 +899,7 @@ msgstr[4] "%s: %s beart níos lú sa chomhad; ag stuáil le nialais" 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "ábhar gan dumpáil" @@ -887,7 +928,7 @@ msgstr "%s: is ionann é agus an chartlann féin; gan dumpáil" msgid "%s: File removed before we read it" msgstr "%s: Scriosadh an comhad sular léadh é" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "níor dumpáladh an chomhadlann" @@ -939,168 +980,168 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "Comhaid theorantacha á mbaint amach mar ghnáthchomhaid" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Ag déanamh iarracht ar naisc shiombalacha a bhaint amach mar naisc chrua" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "%s á léamh\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Ceanntásc ainm fada gan choinne" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Cineál anaithnid comhaid `%c', á bhaint amach mar ghnáthchomhad" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Tá an %s reatha níos nuaí nó ar comhaois" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Níorbh fhéidir cúltaca a dhéanamh" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Ní féidir %s a athainmniú go %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Ní féidir biseach a dhéanamh i ndiaidh earráid: ag scor" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Athainmníodh an chomhadlann ó %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Athainmníodh an chomhadlann" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Comhadlann nua" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Stampa ama neamhbhailí" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Am neamhbhailí mionathraithe (soicindí)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Am neamhbhailí mionathraithe (nanashoicindí)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Uimhir neamhbhailí gléis" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Uimhir inode as raon" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Réimse rófhada agus an comhad roghbhlúire á léamh" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Earráid agus an comhad roghbhlúire á léamh" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Comhadchríoch gan choinne sa chomhad roghbhlúire" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Luach réimse gan choinne sa chomhad roghbhlúire" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Críochnaitheoir taifid ar iarraidh" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Drochfhormáid incriminteach" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Ní thacaítear leis an leagan seo den fhormáid incriminteach: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, 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:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir míchumtha: 'X' faoi dhó" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir míchumtha: ainm folamh i 'R'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir míchumtha: 'T' gan 'R' roimhe" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir míchumtha: ainm folamh i 'T'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir míchumtha: níor úsáideadh 'X' riamh" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, 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:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ní féidir an chomhadlann a stat: gan ghlanadh" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s á scriosadh\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ní féidir scriosadh a dhéanamh" @@ -1120,19 +1161,19 @@ msgstr "bloc %s: ** bloc de NULanna **\n" msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Deireadh comhaid **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1140,68 +1181,68 @@ msgstr "" "ag glacadh le comhlánú dénártha" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Tá ceanntásca le bunuimhir 64 i léig sa chartlann" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " nasc le %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " cineál anaithnid comhaid %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Nasc Fada--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Ainm Fada--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Ceanntásc Imleabhair--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Ar lean ag beart %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Comhadlann á cruthú:" @@ -1238,24 +1279,24 @@ msgstr "bealach idir próisis" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Aimsíodh saoróga in ainmneacha comhaid." -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" -msgstr "Úsáid --wildcards chun meaitseáil patrún a chumasú, nó --no-wildcards" +msgstr "Úsáid --wildcards chun comhoiriúnú patrún a chumasú, nó --no-wildcards" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "chun an rabhadh seo a mhúchadh." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ní sa chartlann é" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Níl rud riachtanach sa chartlann" @@ -1263,7 +1304,7 @@ msgstr "%s: Níl rud riachtanach sa chartlann" #: src/tar.c:79 #, c-format msgid "Options `-%s' and `-%s' both want standard input" -msgstr "Tá gá leis an ionchur caighdeánach ar na roghanna `-%s' agus `-%s'" +msgstr "Tá an gnáth-ionchur de dhíth ar na roghanna `-%s' agus `-%s'" #: src/tar.c:156 #, c-format @@ -1282,7 +1323,7 @@ msgstr "" "Stíl anaithnid athfhriotail `%s'. Bain triail as `%s --quoting-style=help' " "chun liosta a fheiceáil." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1302,7 +1343,7 @@ msgstr "" "(foclach).\n" " tar -xf cartlann.tar # Bain gach comhad amach as cartlann.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1324,87 +1365,87 @@ msgstr "" "bhfuil\n" " never, simple déan cúltacaí simplí i gcónaí\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Príomh-mhód oibre:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "taispeáin an t-ábhar i gcartlann" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "bain comhaid as cartlann" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "cruthaigh cartlann nua" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "taispeáin difríochtaí idir cartlann agus córas comhaid" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "iarcheangail le deireadh cartlainne" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "ná hiarcheangail ach comhaid mhionathraithe leis an gcartlann" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "iarcheangail comhaid tar le cartlann" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "scrios as an gcartlann (nach ar théipeanna maighnéadacha!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "tástáil lipéad imleabhair na cartlainne agus scoir" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Mionathraitheoirí oibríochta:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "caith le gannchomhaid go héifeachtach" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "PRÍOMH[.MION]" -#: src/tar.c:401 +#: src/tar.c:403 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:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "déan cúltaca incriminteach de shean-nós GNU" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "COMHAD" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "déan cúltaca incriminteach nua-aoise GNU" -#: src/tar.c:407 +#: src/tar.c:409 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:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "UIMHIR" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1416,119 +1457,122 @@ 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:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "tá an chartlann inchuardaithe" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" +"ná seiceáil uimhreacha gléasanna agus cartlanna incriminteacha á gcruthú" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" +"seiceáil uimhreacha gléasanna agus cartlanna incriminteacha á gcruthú " +"(réamhshocrú)" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Rialú forscríofa:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "fíoraigh an chartlann i ndiaidh ag scríobh" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "scrios comhaid i ndiaidh iad a chur leis an gcartlann" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "ná forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "scrios gach comhaid sula scríobhtar air" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "folmhaigh géagchóras sula mbaintear comhadlann amach" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "ná forscríobh meiteashonraí comhadlainne" -#: src/tar.c:445 +#: src/tar.c:447 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:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Roghnaigh sruth aschurtha:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" -msgstr "bain comhaid amach agus scríobh ar aschur caighdeánach" +msgstr "bain comhaid amach agus scríobh ar an ngnáth-aschur" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "ORDÚ" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "píopaigh comhaid bhainte go ríomhchlár eile" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "ná bac le cóid scortha na macphróiseas" -#: src/tar.c:460 +#: src/tar.c:462 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:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Tréithe comhaid á láimhseáil:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "éiligh AINM mar úinéir de chomhaid bhreise" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "éiligh AINM mar ghrúpa de chomhaid bhreise" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DÁTA-NÓ-COMHAD" -#: src/tar.c:472 +#: src/tar.c:474 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:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "ATHRUITHE" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "déan ATHRUITHE ar mhód de chomhaid bhreise" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "MODH" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1538,27 +1582,27 @@ 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "ná bain am mionathraithe an chomhaid" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "bain triail as úinéireacht a choinneáil" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "bain comhaid amach mar thusa féin" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "bain úsáid as uimhreacha d'ainmneacha úsáideora/grúpa" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "bain eolas faoi cheadanna (réamhshocrú don fhorúsáideoir)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1566,15 +1610,15 @@ msgstr "" "cuir umask an úsáideora i bhfeidhm agus ceadanna á mbaint ón chartlann " "(réamhshocrú do ghnáthúsáideoirí)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "sórtáil ainmneacha le cur in oiriúint" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "ar comhbhrí le -p agus -s araon" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1582,139 +1626,139 @@ msgstr "" "ná socraigh amanna mionathraithe ná ceadanna de na comhadlanna go dtí go " "bhfuil an bhaint curtha i gcrích" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "cealaigh an éifeacht de rogha --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Roghnú gléis agus malartú:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "CARTLANN" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "bain úsáid as cartlann chomhaid nó gléas CARTLANN" -#: src/tar.c:513 +#: src/tar.c:515 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:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "bain úsáid as ORDÚ in ionad rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "bain úsáid as ORDÚ cian in ionad rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "sonraigh tiomántán agus a dhlús" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "cruthaigh/liostaigh/bain amach cartlann le hiliomad imleabhair" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "athraigh téip i ndiaidh UIMHIR × 1024 beart" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "rith script i ndiaidh gach téip (-M intuigthe)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "úsáid/nuashonraigh an uimhir imleabhair i gCOMHAD" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Blocáil ghléis:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOIC" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOIC × 512 beart sa taifead" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "UIMHIR beart sa taifead, iolraí de 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "déan neamhshuim ar bhloic nialasacha sa chartlann (is ionann le EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "athbhlocáil le linn léimh (le píopaí 4.2BSD)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Roghnú formáide:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMÁID" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "cruthaigh cartlann san fhormáid seo" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "Is FORMÁID ceann de na rudaí seo:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "seanfhormáid V7 tar" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "formáid de réir GNU tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "formáid de réir GNU tar 1.13" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formáid POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formáid POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "ar comhbhrí le pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "is ionann le --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "is ionann le --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "lorgfhocal[[:]=luach][,lorgfhocal[[:]=luach]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "rialaigh lorgfhocail pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TÉACS" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1722,88 +1766,100 @@ 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:592 -#, fuzzy +#: src/tar.c:594 msgid "Compression options:" -msgstr "Roghanna contrártha comhbhrúite" +msgstr "Roghanna comhbhrúite:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" -msgstr "" +msgstr "úsáid iarmhír na cartlainne chun an modh comhbhrúite a dhéanamh amach" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use 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:601 msgid "filter the archive through bzip2" msgstr "scag an chartlann le bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "scag an chartlann le gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "scag an chartlann le compress" -#: src/tar.c:605 -#, fuzzy +#: src/tar.c:610 msgid "filter the archive through lzma" +msgstr "scag an chartlann le lzma" + +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" msgstr "scag an chartlann le gzip" -#: src/tar.c:606 +#: src/tar.c:613 msgid "PROG" msgstr "CLÁR" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "scag le CLÁR (ní foláir -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Roghnú comhaid logánta:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "COMHADLANN" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "athraigh go dtí COMHADLANN" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "tóg ainmneacha le baint/cruthú as comhad COMHAD" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "léigh ainmneacha, foirceanta le NULanna; múch -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" "bain comharthaí athfhriotail ó chomhadainmneacha a léadh le -T (réamhshocrú)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "ná bain comharthaí athfhriotail ó chomhadainmneacha a léadh le -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "PATRÚN" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "fág comhaid as an áireamh, tugtha mar PHATRÚN" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "fág as an áireamh aon phatrún atá i gCOMHAD" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1811,92 +1867,90 @@ msgstr "" "gabh thar ábhar na gcomhadlann ina bhfuil CACHEDIR.TAG, seachas an comhad " "clibe féin" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "gabh thar gach rud faoi chomhadlanna ina bhfuil CACHEDIR.TAG" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "gabh thar chomhadlanna ina bhfuil CACHEDIR.TAG" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "gabh thar gach rud faoi chomhadlanna ina bhfuil COMHAD" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "gabh thar chomhadlanna a bhfuil COMHAD iontu" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "gabh thar chomhadlanna a bhaineann le córas rialaithe foinsí" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "ná téigh isteach i bhfochomhadlanna go huathoibríoch" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "ná fág an córas comhaid seo agus cartlann á cruthú" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "téigh isteach i gcomhadlanna (réamhshocrú)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "ná struipeáil `/' tosaigh ó ainmneacha comhaid" -#: src/tar.c:656 +#: src/tar.c:665 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:658 -#, fuzzy +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -"lean naisc shiombalacha; cartlannaigh agus dumpáil na comhaid a nascann na " -"naisc leo" +"lean naisc chrua; cartlannaigh agus dumpáil na comhaid a nascann na naisc leo" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "AINM-BAILL" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "tosaigh ag ball AINM-BAILL sa chartlann" -#: src/tar.c:662 +#: src/tar.c:671 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:664 +#: src/tar.c:673 msgid "DATE" msgstr "DÁTA" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "déan comparáid le dáta/am modhnaithe" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "MODH" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "déan cúltaca sula scriostar, roghnaigh modh oibre maidir le leaganacha" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "TEAGHRÁN" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1904,92 +1958,92 @@ 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:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Trasfhoirmiú ainmneacha comhaid:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "struipeáil UIMHIR comhpháirt tosaigh ó ainmneacha comhaid" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "SLONN" -#: src/tar.c:679 +#: src/tar.c:688 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:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -"Roghanna maidir le meaitseáil ainmneacha comhaid (cuirfear iad seo i " +"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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "ná bí cásíogair" # subject is "exclude patterns" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" -msgstr "meaitseálann patrúin le tosach d'ainmneacha comhaid" +msgstr "comhoiriúnaíonn patrúin do thosach ainm an chomhaid" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" -msgstr "meaitseálann patrúin tar éis gach `/' (réamhshocrú i gcás eisiata)" +msgstr "comhoiriúnaíonn patrúin tar éis gach `/' (réamhshocrú i gcás eisiata)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "dealaigh idir litreacha beaga/móra (réamhshocrú)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "úsáid saoróga (réamhshocrú do phatrúin eisiata)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" -msgstr "meaitseáil teaghráin carachtar ar charachtar" +msgstr "comhoiriúnú teaghráin carachtar ar charachtar" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "ní ghlacann saoróga le `/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" -msgstr "meaitseálann saoróga le `/' (réamhshocrú le patrúin eisiata)" +msgstr "comhoiriúnaíonn saoróga do `/' (réamhshocrú le patrúin eisiata)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Aschur faisnéiseach:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "taispeáin gach comhad atá próiseáilte, go foclach" -#: src/tar.c:711 +#: src/tar.c:721 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:713 +#: src/tar.c:723 msgid "ACTION" -msgstr "" +msgstr "GNÍOMH" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" -msgstr "" +msgstr "déan GNÍOMH ag gach seicphointe" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "taispeáin eolas mura bhfuil gach nasc dumpáilte" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "COMHARTHA" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2001,61 +2055,61 @@ 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:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "taispeáin dátaí mionathraithe de réir UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "scríobh aschur foclach i gCOMHAD" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "taispeáin bloc sa chartlann le gach teachtaireacht" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "iarr deimhniú ar gach gníomh" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "taispeáin réamhshocruithe tar" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -"agus á liostú nó á bhaint amach, taispeáin gach comhadlann nach meaitseálann " -"leis an gcuardach" +"agus á liostú nó á bhaint amach, taispeáin gach comhadlann nach bhfuil " +"comhoiriúnaithe don chuardach" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "taispeáin ainmneacha comhaid/cartlainne i ndiaidh trasfhoirmithe" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STÍL" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "cuir carachtair athfhriotail timpeall na carachtair ó TEAGHRÁN" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "ná húsáid comharthaí athfhriotail timpeall carachtair ó TEAGHRÁN" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Roghanna Comhoiriúnachta:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2063,56 +2117,56 @@ msgstr "" "is ionann le --old-archive le linn cruthaithe; is ionann le --no-same-owner " "le linn baint" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Roghanna eile:" -#: src/tar.c:761 +#: src/tar.c:771 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:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Ná tabhair ach ceann de na roghanna `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Roghanna contrártha comhbhrúite" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Comhartha anaithnid: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Comhad samplach dáta gan aimsiú" -#: src/tar.c:997 +#: src/tar.c:1017 #, 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:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Rogha %s: Ag caitheamh le dáta `%s' mar %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: léadh an liosta comhad cheana" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: tá carachtar nialasach sa chomhadainm a léadh" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Argóintí bailí do roghanna --quoting-style:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2120,109 +2174,115 @@ msgstr "" "\n" "Luachanna réamhshocraithe don tar *seo*:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Fachtóir bacainneach neamhbhailí" -#: src/tar.c:1340 +#: src/tar.c:1369 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?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Fad téipe neamhbhailí" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Níos mó ná spriocdháta amháin" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Leagan neamhbhailí ar fhormáid na ngannchomhad" -#: src/tar.c:1552 +#: src/tar.c:1585 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:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "ní mór do luach --checkpoint a bheith ina slánuimhir" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Grúpa neamhbhailí" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Mód neamhbhailí ar rogha" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Uimhir neamhbhailí" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Úinéir neamhbhailí" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Méid taifid neamhbhailí" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Tá líon na mball neamhbhailí" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Ní cheadaítear ach aon rogha --to-command amháin" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Tá an argóint dlúis míchumtha: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Dlús anaithnid: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[COMHAD]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Tá gá le hargóint ar an seanrogha `%c'." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "tá an rogha --occurrence gan bhrí in éagmais liosta comhad" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "níl an rogha --occurrence ar fáil sa mhód iarrtha" -#: src/tar.c:2232 +#: src/tar.c:2271 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:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Ní féidir --listed-incremental a úsáid le --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2232,42 +2292,50 @@ 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Ní féidir cartlanna le hiliomad imleabhair a fhíorú" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a fhíorú" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Ní féidir úsáid a bhaint as cartlanna il-ranna comhbhrúite" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a iarcheangal" -#: src/tar.c:2293 +#: src/tar.c:2332 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:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Ní chruthófar cartlann fholamh (go cladhartha)" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Níl na roghanna `-Aru' ar fáil in éineacht le `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Ní foláir rogha amháin de `-Acdtrux' ar a laghad" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Earráid; tobscor moillithe ó earráidí roimhe seo" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2279,106 +2347,104 @@ 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:158 +#: src/xheader.c:156 #, 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:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Ní féidir an patrún %s a úsáid" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ní féidir an lorgfhocal %s a shárú" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Ceanntásc míchumtha breisithe: fad ar iarraidh" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Fad an cheanntáisc breisithe as raon" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "Fad %*s as raon sa cheanntásc breisithe" -#: src/xheader.c:525 +#: src/xheader.c:523 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:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Ceanntásc míchumtha breisithe: sín chothroime ar iarraidh" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Ceanntásc míchumtha breisithe: líne nua ar iarraidh" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -"Eochairfhocal anaithnid `%s' sa cheanntásc breisithe; ag déanamh neamhshuim " -"air" +"Lorgfhocal anaithnid `%s' sa cheanntásc breisithe; ag déanamh neamhshuim air" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" -"Tá an péire a cruthaíodh (eochairfhocal/luach) rófhada (eochairfhocal=%s, " -"fad=%s)" +"Tá an péire a cruthaíodh (lorgfhocal/luach) rófhada (lorgfhocal=%s, fad=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Ceanntásc míchumtha breisithe: %s=%s neamhbhailí" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Ceanntásc míchumtha breisithe: %s=%s sa bhreis" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, 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:1338 +#: src/xheader.c:1336 #, 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:107 -#, fuzzy, c-format +#, c-format msgid "%s: not a valid timeout" -msgstr "%s: Grúpa neamhbhailí" +msgstr "%s: teorainn ama neamhbhailí" #: src/checkpoint.c:112 #, c-format msgid "%s: unknown checkpoint action" -msgstr "" +msgstr "%s: gníomh anaithnid seicphointe" #: src/checkpoint.c:132 msgid "write" -msgstr "" +msgstr "scríobh" #: src/checkpoint.c:132 msgid "read" -msgstr "" +msgstr "léamh" #. TRANSLATORS: This is a ``checkpoint of write operation'', #. *not* ``Writing a checkpoint''. @@ -2421,7 +2487,7 @@ msgstr "Cruthaigh comhad leis an MÉID seo" #: tests/genfile.c:130 msgid "Write to file NAME, instead of standard output" -msgstr "Scríobh i gcomhad AINM, in ionad an aschuir chaighdeánaigh" +msgstr "Scríobh i gcomhad AINM, in ionad an ghnáth-aschuir" #: tests/genfile.c:132 msgid "Read file names from FILE" @@ -2533,102 +2599,118 @@ msgstr "Uimhir as raon: %s" msgid "Negative size: %s" msgstr "Méid diúltach: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "theip ar stat(%s)" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Earráid agus uimhir á parsáil i ngar do `%s'" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Formáid anaithnid ar an dáta" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGÓINTÍ...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "ní féidir `%s' a oscailt" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "ní féidir 'seek' a dhéanamh" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "tá carachtar nialasach sa chomhadainm" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -"ní féidir gannchomhaid a chruthú ar an aschur caighdeánach; úsáid rogha --" -"file" +"ní féidir gannchomhaid a chruthú ar an ngnáth-aschur; úsáid rogha --file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "masc mícheart (i ngar do `%s')" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Réimse anaithnid `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "ní féidir an t-am a shocrú ar `%s'" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "D'éirigh leis an ordú\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Theip ar an ordú le stádas %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Stopadh an t-ordú le comhartha %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Stopadh an t-ordú ar chomhartha %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Rinne an t-ordú córdhumpa\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Ordú críochnaithe\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "Tá ainmneacha comhaid de dhíth ar --stat" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "an iomarca argóintí" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "cealaigh an éifeacht de rogha --delay-directory-restore" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Earráid; tobscor moillithe ó earráidí roimhe seo" + #~ msgid "[.]NUMBER" #~ msgstr "[.]UIMHIR" diff --git a/po/gl.gmo b/po/gl.gmo index 6bed45d943af456dabde5b39b5cbada4e130f3a9..a4a575f0988840719d213d0d035705e0770e1dc2 100644 GIT binary patch delta 2991 zcmYk-drXye9LMqRLB!5ME`o9qlcR<=MBsQ7LxeP;pbKb%A&Olk?`e{z(gR|YC|aJ} z?BdGQsi|x2*dNslbJfxeXRTaqTCQf)vQ5j}><@Z>4o_Rp_&%@S@9}wlm+$ZQJGL$A zYH%(lMej7O9mEjgNVM6fSmfo#Rn^~&Kby%d1?zD*HsWo#3*+!O>iaJ+7rQYN)A+|J zI2i}yY8-&uG1bhmJroA<;C)QQvp5ug#DUm@g*Y(2x8q7w1FJ9%Hz9r5ZVcetI07%A z2JA`bZ7&Tq@B-Jlm`MND6qnOg5#*y;;q<*S-8)Aej0PA z-#|ZRG1`$>hDo>#m6>Kq|Mn&Y51zmnJc;V?6zYSYa18#96VcB@4WI_qP%CERUM$12 zH~~|V&BkH{MwSfq{VvSIE_AeJJrs&@2>Dinb*LBCV+I~U&Gd6rMlPc|yoGgBJ&4L! z4XUGcsCITENwnjr0e^{fWjE1}@hRk=vgNW+YN!;I$_CU29mu5Z0}S99RD(UJ_Y>Gb zv6zqi*;H<7uNoPnEkRAN8QDg*8#RE#uAQmmpKRIJJkSg;Bg7*ZZXD9`AIFcJ#wdttiSBo=n zEl$AWI3BN}2mPcak{ND3>LsY}D%|IbP$_Ri?S+?712~3^!A>C=bnIse+C10Y7t&dW zzSPH~PD2pYz!X%9>u@n6*oqu+yFsto3o*Pz6E+&P1f{5qu0*xJ2`A%0)Y4qS={o<( z{@xMQpi;gPY1`V7$=X3=r1pth{|2=bSFr@W^sWxeQ8R2r&9EJnf&HiqhEW6f1+`Ru zj>>TQw?Yb9!}+Ll-im7IsQdgR>RflD);^c%jK;aBl((X0{ub)gbh`E5QSW*Ao!0XJ z>W66oGI{GjM;#uepj~<%8Jt~lO<+_W>iMWtPe5g8x@#Q|{LV&W+B@25~Us`o#M1}vw(7d6u>Sb%9vLo=vCec0q0Ms3PpF<0*~8@+!w z>Up#4J6J^hB9cVQpm9yOcr5wX3}(9zHlsd#1IeCs;S9WnOv(yaXmv0jmHM4nipNmL z^d{=NevDQfWTTd58v3ywwKp8(ReMzh9lOs^o9+VYgMUz)B#nG(Ndl;m&qnR)HK>1Y zM-6NrYE4h0eiwd2b#N1vv60M56Pw3POS1*_z0*m7zU({nVhnlY8%xAwEOwoRWZ4#? zPQ`ZACOwQA@CnrJzJMA?3TIVLLhYFv)PPo?GV>ZTaL3-Ipa##QQu8PJFrGuI2GUU( zxE=jihuTCNP@C&R)C8`f2Qve`0~&_0)QeHySGX?4IO^LXb;s;=3Q0Wp2-V>^OvI~5 zn-)dB{1`+%uf}*>h+6AL)E;^TH2`H%muA^SloNdky`#)-CN$ueh<2q;*AAkVP$r%s zG;$|&$U9=ta!R_iJ7z^n{6vK=c{55MqNV}sYU?F(PvZWdTVI6HCR=#G}L=!~>y^eHmG;lyqrhOd%d7?jhC? zy0#G2Ax~`T#78J;|Gr4*swDD=W?~bup3pwMi`YsmCbB~q+Y&6kGJWJ?Elo0%0M1Cm1R%qZ)Q&>$rK|D`X5!=J%{b%^X@1+cj4qqQU kuTOk_ASY1Z&&w+e2D9@5;RQoW;=*ULGy8_)^VjzI7p;;clK=n! delta 3167 zcmYk+3s6*59LMp4qQ>%65DHW-f=@y~fl$duiDsH;U}B=Q$)ZcbuDc70uT@Kl%rIA* z(yXj>#>~uNrkso!HPasE)HIe(S=rS1ii~ucW}K$JKe*0xXaDze?&aQd{^x(r<;R}{&8W(}CK=xxr4fcdVNd)SHQ*K03*9*l!$i!-38(}bP#wL2nfMV- z#_Ko=3*wC#jy2f1WT^KKV-Eg~L9JOTbsmRBs18@69@vQ~cp5d+%czRfs^{(h2(5nQ4{?H*b+H{CE1EfxGhLSFMf(7Wv-(V>BYCA z(kCN*nF3TIC8*~rP#pzOm3S39D~9@d&LUlzo2bnfLuVQ=A9a5ssxrZOcEgLkxUm8G zna!N2y4i>7@F-5gA8{0BP>vB;j$zn@s!%g02ku3^cgVi~C93r8sJ(FuNg!xas5eQP z98@W%p*B+mD#Nwd1Gl5Tj-99uUPqPsIM$HC4djzI3;3h+Yc zzr%4D$Ies#C8!y%#sWNqC3tx-_1A-ieDwLa3@to>WAO}5MF(kXre$~!22nG6ANAfZ zw#j6#O*s>@^&IN?gZBMPwuy9B#Qoyo)L$iE&kfCZ4{8QS?CU>J9rk2FsjA7xNjMiZ zvsaMGn$xI({zNUoaI!1LsThSVsP|t+jdK*WB;N#SSTt^+Hc0}#(uc`LeSY&$o6m=O zVGC-n96&A2Dbxh6pmui@+3N49sKiF2mbMc0eE0iG0g{P;cxc+Xf{v`*8@;%o`w9(EKW*5)zqO$28%dN zC3+BgNG0AxDB}?EETLl?@hG86tRy0db)n{n^u8WiIjQ=uPNQr56xebn(AqX=q(!e6W@~i-{7Vk|-zm zXJPIow0$2YZXc|(xu4MDuOQYCIwlkI2$wE6nh5RKaH4@&OC%8E3I4Bi{=)#{RpQHO z)Dv!^nV3a9-#RR6k|WKv+#Rs0TuYpdt}3hA=c%>4K39X=Q}4H2KA*?uZ>>%o8s2ZQ z+ix{^mekj}ELxuWfaR&S{H~?-uDXS-o02QL$K>Q?<>pzr`D1cMXXcD*{k#A8=&Vv_ zdzI7jdVHOISw2_5=kz\n" "Language-Team: Galician \n" @@ -80,7 +80,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Escriba '%s --help' para máis información.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -92,15 +92,15 @@ msgstr "" msgid "Unknown system error" msgstr "Erro do sistema descoñecido" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -135,7 +135,7 @@ msgstr "%s: a opci msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -194,16 +194,16 @@ msgstr "%s: a opci msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opción \"-W %s\" non admite un argumento\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "memoria esgotada" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Non se puido obte-lo directorio actual" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Non se pode armacena-lo directorio de traballo" @@ -323,11 +323,23 @@ msgstr "\"" msgid "'" msgstr "\"" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -530,103 +542,103 @@ msgstr "Fin de ficheiro prematura" msgid "Garbage command" msgstr "Comando lixo" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Isto non semella un arquivo tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Bytes totais escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Bytes totais escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(canalización)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Valor non válido para record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Non se proporcionou o nome do arquivo" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Non se poden verifica-los arquivos da entrada/saída estándar" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Non se poden actualiza-los arquivos comprimidos" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "No comezo da cinta, saíndo agora" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Demasiados erros, saíndo" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contén un número de volume non válido" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Desbordamento no número de volume" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare o volume #%d para %s e prema enter: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Chegouse á fin de ficheiro onde se esperaba unha resposta do usuario" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "AVISO: O arquivo está incompleto" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -638,69 +650,75 @@ msgstr "" " ! Executar outro intérprete de comandos\n" " ? Amosar esta lista\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Non hai novos volumes; saíndo.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "O comando \"%s\" fallou" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s non continúa neste volume" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s ten un tamaño incorrecto (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora da secuencia" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "O arquivo non está etiquetado para coincidir con %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "O volume %s non coincide con %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +#, 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" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -712,8 +730,8 @@ msgstr[1] "So se puido ler %lu de %lu bytes" msgid "Contents differ" msgstr "O contido é diferente" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fin de ficheiro inesperado no arquivo" @@ -831,7 +849,7 @@ msgstr[1] "%s: O ficheiro encolleu %s bytes; enchendo con ceros" 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 #, fuzzy msgid "contents not dumped" msgstr " (memoria volcada)" @@ -861,7 +879,7 @@ msgstr "%s: o ficheiro msgid "%s: File removed before we read it" msgstr "%s: Ficheiro eliminado antes da súa lectura" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -912,171 +930,171 @@ msgstr "%s: Renomeouse o directorio antes de poder estrae-lo seu estado" msgid "Extracting contiguous files as regular files" msgstr "Extraendo os ficheiros contiguos coma ficheiros normais" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Tentando extrae-las ligazóns simbólicas coma ligazóns duras" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Lendo %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, 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" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Non se puido copiar este ficheiro" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Non se pode renomear a %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "O erro non é recuperable: sáese agora" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Renomeouse o directorio" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Renomeouse o directorio" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: O directorio é novo" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Marca de tempo non válida" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Proporcionouse na opción un modo non válido" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Número de dispositivo non válido" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Número de inode non válido" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 #, fuzzy msgid "Read error in snapshot file" msgstr "Erro de lectura en %s" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, 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:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Non se pode eliminar" @@ -1096,20 +1114,20 @@ msgstr "bloque %s: ** Bloque de nulos **\n" msgid "block %s: ** End of File **\n" msgstr "bloque %s: ** Fin de Ficheiro **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "bloque %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1117,68 +1135,68 @@ msgstr "" "a 2" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "O arquivo contén cabeceiras base-64 obsoletas" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " ligazón a %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " Tipo de ficheiro %s descoñecido\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeceira de Volume--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continúa no byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Creando o directorio:" @@ -1215,24 +1233,24 @@ msgstr "canle interproceso" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Non atopado no arquivo" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Non atopado no arquivo" @@ -1257,7 +1275,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1278,7 +1296,7 @@ msgstr "" " # dando moitos datos\n" " %s -xf arquivo.tar # Extraer tódolos ficheiros de arquivo.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1300,87 +1318,87 @@ msgstr "" " nil, existing numera se existen copias de seguridade numeradas\n" " never, simple sempre fai copias de seguridade sinxelas\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Fin de ficheiro inesperado no arquivo" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1388,561 +1406,574 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 #, fuzzy msgid "remove files after adding them to the archive" msgstr "Borrando a especificación de unidade dos nomes do arquivo" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Erro ao gravar na saída estándar" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Non se pode verifica-los arquivos multi-volume" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Arquivar da entrada estándar" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Opcións de compresión conflictivas" -#: src/tar.c:594 +#: src/tar.c:596 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Non se puido escribir no programa de compresión" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: o ficheiro é o arquivo; non se envorca" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Non se pode cambia-lo directorio de traballo" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Eliminadndo o \"%.*s\" inicial dos nomes dos membros" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "O volume %s non coincide con %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1950,268 +1981,282 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 #, fuzzy msgid "ask for confirmation for every action" msgstr "Non se puido le-la confirmación do usuario" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Non pode especificar máis dunha das opcións \"-Acdtrux\"" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Opcións de compresión conflictivas" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " Tipo de ficheiro %s descoñecido\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Non se atopou o ficheiro de data" -#: src/tar.c:997 +#: src/tar.c:1017 #, 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:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Factor de bloqueo non válido" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Aviso: a opción -I non está soportada; ¿quería dicir -j ou -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Lonxitude da fita non válida" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Máis dunha data de umbral" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Grupo non válido" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Proporcionouse na opción un modo non válido" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Número de inode non válido" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Propietario non válido" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Tamaño de rexistro non válido" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "Lonxitude da fita non válida" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Patrón descoñecido `%s'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "A antiga opción \"%c\" precisa dun argumento." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Varios ficheiros de arquivo requiren a opción \"-M\"" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Non se pode combinar --listed-incremental con --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Non se pode verifica-los arquivos multi-volume" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Non se poden verifica-los arquivos comprimidos" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Non se poden empregar arquivos comprimidos multi-volume" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Non se poden actualiza-los arquivos comprimidos" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "De xeito cobarde rexéitase crear un ficheiro baleiro" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "As opcións \"-Aru\" son incompatibles con \"-f -\"" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Debe especificar unha das opcións \"-Acdtrux\"" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Saída por erro retrasada dos erros anteriores" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2220,79 +2265,79 @@ 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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2456,97 +2501,107 @@ msgstr "N msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Erro do sistema descoñecido" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "Non se puido abrir %s" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Non se pode pechar" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "Patrón descoñecido `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "Non se puido evalua-lo ficheiro %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "O fillo morreu co sinal %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Nomes de ficheiro alterados--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -3012,6 +3067,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Escrito por John Gilmore e Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Saída por erro retrasada dos erros anteriores" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" @@ -3081,10 +3139,6 @@ msgstr "" #~ msgid "Only wrote %u of %u bytes to %s" #~ msgstr "Só escritos %u dun total de %u bytes en %s" -#~ msgid "Archive %s EOF not on block boundary" -#~ msgstr "" -#~ "A fin do ficheiro (EOF) do arquivo %s non se atopa no límite do bloque" - #~ 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 1c10d1a275164b89257f9e8c5295f2ac2190bb78..1858ec8d4924de5d00da45a7b98ea4baa2fd295c 100644 GIT binary patch delta 2991 zcmYk+drVe!9LMqRqag8sfZS9tcofkHmD_`uKxlah%|KENHBAdeQSt(2-VTUS310H4 zO*hf#GH2-@No{FE%hslpT3OAd-Bxq*5d%&g#*nT>!6XqjpG=D7cd3C$9TMr<1s#}ci=Kq2WxN;ZbQbhcFe^$Fb%&! zCG3gr?Qak&@dDSm7{mCs*?nLq=J3E#R0rSTQ0z-qgE8H;1V?dQg?C~LrsHew{car1 z^)2*aI@ylEDHw|@QI%~&OSzQP>r!#wIeKL)1)m2d;I%b_g}ldH4R;sEYjN8qOeLTstW=G~ftMRMqZ7ZNDm< zgzGU6yKoHNKo9yTORzGWyj+){-kav$Uxq4q3u-OAh)UpXBnLZ-RM4@XXlU{DxDO0w z9zwYugW3&#R0oBq63@e0GH63p<_|_yhoL-l7y57{mLmTGY&H6@5yxT&YI|P7QtkhK z{8c3^M`gGU>DyXSQ*ap7(P`vopK;P6x{2Cu{f3%Nz!|71+=+Ux12sh_a6ERSDj3QZ zQNn&4&iGbFLmAbh=I#|#M`zvpSFo6CFJ;n~J%HLBt56-ayS|J1KXDNm%l>h%Q~5uw z`=zM0vljW;0ZxuG`jCdc{3hzfFv=k_(1X)a+i(UlOSaH;6KYEKVG(wt)=C&(pC#d8h|Foe%jC5li9 zR-vZsAnN^N7=xFPS+Ji`1NLX$G)@}o!wVc5daxXQxCpfkx1#p@KGYY!h5YObPI}%$ zR^(!_sHrPP4P1d5U_EMT+b|#BLsjGk-h)Z}Q3*M-XlRa>V>li}&COwCtJ`JN0Jl&H zMP~In9MwS)YOPeD60Ap6rUSK$PP*4ukRsThs1Hcb4pzXiu{88T8S2YdU?euX_jjWz za1^x$KE;XHgG#)BZ0XZhpcd zLM4Bih#;K6;qbJCI$AoEdquFt|Fpml;mMO9<4RwuqotSNIhOMy?)4gsCX{F&Vj)pY z)Dq7TO@WEtEYH@!YH!-;wOscnbgU#c5HpAv;vr%Q@i;MocsTHZH#xnTmJY2f?b}7f zbmA#OM=LQq;E5QRznGS0aW|o(j8JhKiEYG2LhE!Y(MBvMG6PNCxQRPx%_Ei(S|3`3 zvxxb`gTw$rM-lNTu~QfSJ5~icBI2AC+*wLg5(|hqLMV_% zopChBvc~d{QbSE=vb1*{d!2DK%gP$37l$adnP#e~?+>?`?(DOlbMM}J&U2r0&YrJr zuk(K$8@9`E>?DR0Z-g219#%#0#nBLL3?I|TS3Iu6yKxte!jm`vucDs6fmzs}i^*7s zld%F5aVHMO!uE_@Lg)11a!JddgP zH!9(jL3jEqL_NPKXdA{bzS$SN;Z@AxhL2Dk{DUc&N>;^^AWI8N@gA(jSlouH%yW|Q%^4aY_$~Iu?@$B&gnA&9uXK#Ze4L6(z=!JS1ssd- z;7shn30M$kOa?l!cgj%DpTunZ1^t?{Wa@k`7Na^`gSufaCgBCtoBoKZNMGhl1E!(Q z7oaNULk+YC)z4|9h~_FP;cjG1lgPYSm>Ey~xn|0_ppNV~20KtCJ&bzrB2o;~hZU2H zLr@*hLOr(#qp%hEm`!}C-+f5VrVI6=A0o@kTt_8xD}nl}(T|lx)l3rVO*4^cG-Vi# zOHmy-Q5|<6AG41y-FE_&@CT^Mb)zaYl6lO*`%%xWMNLU3D&f<98hY>?l9cH|CDM<* zqS7ZKeVGDOBIT(2s!$y@qbjiCBa4m_T$1P zUjGzT`fk+P_!CLMZ<44t zNt$d_Dd(UTQxz)1^%#!3P`hI0{MLe>1J{#=-b9jG;R1o=xam(ju> zut592KWEynB{&=FQKftxmB3Y`Z*vnh6)~(hb(D@=GKHu$REgSt^*9xep{DY8)N}pW z8k(vUEW#YjWPIbIp^W#U{!&k%68aJ~cM+6B9c81gPsb_PheIKhH(BGYC9f7rqR3~^n28lDC=U# zL9G=xYBwCfJp33JV(1v^UqWLsuc2+S2UV&Is1jYr$!IZ=dXp+F#dcJ}7cdupL%ql- zZlY+W9LdFaQ3>rvZZYSOvCYlk`LGP?pUj2(cv|~&8S^cpQ~b4{EN$ zvsi#wgqorm$X|f*p$6zgCG=9zw@}YtLam){RDy$;2UVsRwVNu@(*9o+{9!jzEpr@W z@EWQTH&G8pF}f;{hS6Apx?YB=gafrEw&FBAih6-tNDd~Ag%W}ls3~8J5!(N4H1yy` zRAz^If8f6y^$+$L#^SH2Z57JItCS;=+)OU&_vNUBeW<_K?WocpLamWcPzk7-I#eZp zF<-NZa6;KKO=b(Bk_CvZgpQrWVnU@~Lqri90-GaJhk9t~Q0fo$wpjOpvk^(9HqP{> zI-b0PS%pfrGI-vEg9s(shj^5zC0xW)#1ny($gGf!f%%cCZR zQ990_=xqy5Tb<89-T<&Xi(y- zX|xayVly$Hc%~~odPZc5eYK<6sol+A59+FZ6aE6r_N>9*ClJ?U24GS3P|ayV_L+)hWG)o|y|uJakO;mPGbo71Xs dcr2T@&f&9LP6loB(M^-f;k4IuUCC+){TGS8Ws?8^ diff --git a/po/hr.po b/po/hr.po index 2afad6a..596b0df 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2002-04-26 10:49+MET(DST)(UTC+2)\n" "Last-Translator: Mirsad Todorovac \n" "Language-Team: Croatian \n" @@ -82,7 +82,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Poku¹ajte `%s --help' za vi¹e informacija.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -93,15 +93,15 @@ msgstr "" msgid "Unknown system error" msgstr "Nepoznata pogre¹ka u sistemu" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -114,11 +114,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -136,7 +136,7 @@ msgstr "%s: za opciju `%s' neophodan je argument\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -195,16 +195,16 @@ msgstr "%s: opcija `-W %s' nije jednozna msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcija `-W %s' ne dozvoljava argument\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "iscrpljena memorija" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Ne mogu promijeniti radni direktorij" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Ne mogu pohraniti radni direktorij" @@ -327,11 +327,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -536,105 +548,105 @@ msgstr "Prerani kraj datoteke" msgid "Garbage command" msgstr "Neispravna naredba" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Ovo ne izgleda kao tar arhiva" # FIXME -- ovo neæe raditi ako je prevedeno -- Denis? -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Ukupno ispisano bajtova: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" # FIXME -- ovo neæe raditi ako je prevedeno -- Denis? -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Ukupno ispisano bajtova: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(cjevovod - pipe)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Pogre¹na vrijednost za record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Nije dano ime arhive" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Ne mogu verificirati stdin/stdout arhive" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Ne mogu a¾urirati komprimirane arhive" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Poèetak trake, zavr¹avam" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Previ¹e pogre¹aka, zavr¹avam" -#: src/buffer.c:678 -#, fuzzy, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "Neporavnat (unaligned) blok (%lu bajtova) unutar arhive" -msgstr[1] "Neporavnat (unaligned) blok (%lu bajtova) unutar arhive" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Velièina sloga = %lu blokova" msgstr[1] "Velièina sloga = %lu blokova" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, fuzzy, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "Neporavnat (unaligned) blok (%lu bajtova) unutar arhive" +msgstr[1] "Neporavnat (unaligned) blok (%lu bajtova) unutar arhive" + +#: src/buffer.c:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Ne mogu se pomicati unazad unutar arhive; mo¾e biti neèitljiva bez -i" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sadr¾i pogre¹an broj dijela arhive" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Prekoraèenje u broju dijela arhive" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Pripremite dio arhive #%d za %s i pritisni :" -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Naðen EOF gdje sam oèekivao odgovor korisnika" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "UPOZORENJE: Arhiva nije kompletirana" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -646,70 +658,75 @@ msgstr "" " ! Pokreni podljusku operativnog sistema\n" " ? Ispi¹i ovu listu\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Nema novog dijela arhive; zavr¹avam.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "Neuspjela `%s' naredba" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s nije nastavljen za ovom dijelu arhive" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s nije nastavljen za ovom dijelu arhive" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je pogre¹ne velièine (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ovaj dio arhive je izvan slijeda" # FIXME -- clean against source! (TM) -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiva nije oznaèena labelom da odgovara %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Dio arhive %s ne odgovara %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -721,8 +738,8 @@ msgstr[1] "Uspio pro msgid "Contents differ" msgstr "Sadr¾aji se razlikuju" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Neoèekivani EOF u arhivi" @@ -841,7 +858,7 @@ msgstr[1] "%s: Datoteka se skratila za %s bajtova; nadopunjujemo nulama" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: datoteka je na drugom datoteènom sustavu; ne arhiviram ju" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -870,7 +887,7 @@ msgstr "%s: datoteka je arhiva; ne arhiviram ju" msgid "%s: File removed before we read it" msgstr "%s: Datoteka uklonjena (removed) prije nego ¹to smo ju proèitali" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -923,170 +940,170 @@ msgid "Extracting contiguous files as regular files" msgstr "Ekstrahiram neprekinute datoteke kao regularne datoteke" # FIXME -- 'hard links' -- TM -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Poku¹avam ekstrakciju simbolièkih linkova kao hard linkova" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Èitam %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Neoèekivan EOF u mangliranim imenima" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Nepoznat tip datoteke '%c', ekstrahiran kao normalna datoteka" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nisam uspio napraviti backup ove datoteke" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Ne mogu preimenovati u %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Gre¹ka iz koje se ne mogu oporaviti: zavr¹avam s radom" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktoriju promijenjeno ime" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktoriju promijenjeno ime" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Novi direktorij" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Pogre¹na oznaka vremena" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Pogre¹an mod dan opcijom" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Pogre¹an broj ureðaja" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Pogre¹an inode broj" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekivani EOF u arhivi" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" # FIXME -- blocking factor -- can't translate (ask others) -- TM -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ne mogu alocirati memoriju za faktor pakiranja u blokove %d" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: datoteka je na drugom datoteènom sustavu; ne arhiviram ju" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Bri¹em %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ne mogu obrisati" @@ -1106,19 +1123,19 @@ msgstr "blok %s: ** Blok ispunjen NULama **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Kraj datoteke **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Razmaci 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1126,71 +1143,71 @@ msgstr "" "komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktalna vrijednost iz arhive %.*s je izvan %s opsega" # FIXME -- obsolescent -- TM -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiva sadr¾i base-64 zaglavlja zastarjelog formata" # FIXME?? -#: src/list.c:763 +#: src/list.c:772 #, 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 opsega" -#: src/list.c:794 +#: src/list.c:803 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Base-256 vrijednost iz arhive je izvan %s opsega" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Vrijednost %s iz arhive je izvan %s opsega %s..%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " link do %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " nepoznat tip datoteke %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Zaglavlje dijela arhive--\n" # FIXME -- clarify against source -- TM -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Nastavljeno s bajtom %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Kreiram direktorij:" @@ -1227,24 +1244,24 @@ msgstr "me #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nije naðeno u arhivi" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Nije naðeno u arhivi" @@ -1269,7 +1286,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1289,7 +1306,7 @@ msgstr "" "op¹irno.\n" " %s -xf arhiva.tar # Ekstrahiraj sve datoteke iz arhiva.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1310,87 +1327,87 @@ msgstr "" " nil, existing pobrojani ako pobrojani veæ postoje, inaèe jednostavni\n" " never, simple uvijek radi jednostavne backupe\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Neoèekivani EOF u arhivi" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1398,560 +1415,573 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Pogre¹ka u pisanju na standardni izlaz" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" # FIXME -- volume -- find more suitable (ask others) -- TM -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Ne mogu verificirati vi¹edjelne arhive" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Konfliktne opcije formata arhive" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Konfliktne opcije za kompresiju" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: datoteka je arhiva; ne arhiviram ju" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Ne mogu promijeniti radni direktorij" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Uklanjam vodeæe `%.*s' iz imena èlanova" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "Dio arhive %s ne odgovara %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1959,225 +1989,231 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Ne mo¾ete navesti vi¹e od jedne od `-Acdtrux' opcija" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Konfliktne opcije za kompresiju" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " nepoznat tip datoteke %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Datoteka s datumom nije pronaðena" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Substituiram %s za nepoznat format datuma %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" # FIXME -- clarify this against source and man -- TM -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Pogre¹an faktor pakiranja u blokove" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Upozorenje: opcija -I nije podr¾ana; mo¾da ste mislili -j ili -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Pogre¹na duljina trake" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Vi¹e od jednog datuma s pragom (threshold)" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Pogre¹na grupa" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Pogre¹an mod dan opcijom" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Pogre¹an inode broj" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Pogre¹an vlasnik" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Pogre¹na velièina sloga (record)" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Velièina sloga (record) mora biti vi¹ekratnik %d." -#: src/tar.c:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "Pogre¹na duljina trake" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Opcije `-[0-7][lmh]' nisu podr¾ane od strane *ovog* tar-a" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Stara opcija `%c' zahtijeva obavezan argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Vi¹edjelne arhive zahtijevaju `-M' opciju" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Ne mogu kombinirati --listed-incremental s --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2185,44 +2221,52 @@ msgstr[0] "%s: Oznaka dijela arhive je preduga msgstr[1] "%s: Oznaka dijela arhive je predugaèka (limit je %lu bajtova)" # FIXME -- volume -- find more suitable (ask others) -- TM -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Ne mogu verificirati vi¹edjelne arhive" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Ne mogu verificirati komprimirane arhive" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Ne mogu koristiti vi¹edjelne komprimirane arhive" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Ne mogu a¾urirati komprimirane arhive" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + # LOL -- TM -#: src/tar.c:2318 +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Kukavièki odbijam kreirati praznu arhivu!" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opcije `-Aru' nisu kompatibilne s `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Morate specificirati jednu od `-Acdtrux' opcija" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Pogre¹an izlaz (naknadno) zbog prija¹njih pogre¹aka" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2231,80 +2275,80 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Datoteka se skratila za %s bajtova" msgstr[1] "%s: Datoteka se skratila za %s bajtova" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" # FIXME?? -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "Base-64 vrijednost s predznakom %s iz arhive je izvan %s opsega" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Vrijednost %s iz arhive je izvan %s opsega %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2467,98 +2511,108 @@ msgstr "Inode broj izvan opsega" msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Nepoznata pogre¹ka u sistemu" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Ne mogu zatvoriti" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " nepoznat tip datoteke %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Neuspjeli seek na %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Potproces zavr¹io uz signal %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" # FIXME -- 'mangled filenames'??? -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Manglirana imena datoteka--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -3030,6 +3084,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Napisali John Gilmore i Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Pogre¹an izlaz (naknadno) zbog prija¹njih pogre¹aka" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/hu.gmo b/po/hu.gmo index d9e372d5c7b76841f612b2b5c12fa1f57e0c81d6..3ebc393b21dffb435e3695ded368889296ac76c4 100644 GIT binary patch delta 10627 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 eId|>j#HvCd@$?Jzt8-2h?6*G-_h0ya(f, 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: tar 1.19.90\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2008-04-06 17:41+0200\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-05-11 16:11+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" @@ -20,12 +20,12 @@ msgstr "" #: lib/argmatch.c:133 #, c-format msgid "invalid argument %s for %s" -msgstr "a(z) \"%s\" argumentum érvénytelen a következőhöz: %s" +msgstr "a(z) „%s” argumentum érvénytelen a következőhöz: %s" #: lib/argmatch.c:134 #, c-format msgid "ambiguous argument %s for %s" -msgstr "a(z) \"%s\" argumentum nem egyértelmű a következőhöz: \"%s\"" +msgstr "a(z) „%s” argumentum nem egyértelmű a következőhöz: „%s”" #: lib/argmatch.c:153 #, c-format @@ -81,27 +81,27 @@ msgstr " [KAPCSOLÓ...]" #, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" -"További információkért próbáld kiadni a \"%s --help\" vagy \"%s --usage\" " +"További információkért próbálja kiadni a „%s --help” vagy „%s --usage” " "parancsokat.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" -msgstr "A hibákat a(z) %s címen jelentsd.\n" +msgstr "A hibák a(z) %s címen jelenthetők.\n" #: lib/argp-help.c:1929 lib/error.c:125 msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "ezen súgószöveg megjelenítése" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "rövid használati utasítás megjelenítése" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NÉV" @@ -114,11 +114,11 @@ msgstr "a program nevének beállítása" msgid "SECS" msgstr "MP" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "szünet MP másodpercre (alapértelmezetten 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "a programverzió kiírása" @@ -136,39 +136,39 @@ msgstr "%s: túl sok argumentum\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(PROGRAMHIBA) A kapcsolót fel kellett volna ismerni???" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "íráshiba" #: lib/getopt.c:526 lib/getopt.c:542 #, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "%s: a(z) \"%s\" kapcsoló nem egyértelmű\n" +msgstr "%s: a(z) „%s” kapcsoló nem egyértelmű\n" #: lib/getopt.c:575 lib/getopt.c:579 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s: a(z) \"--%s\" kapcsoló nem enged meg argumentumot\n" +msgstr "%s: a(z) „--%s” kapcsoló nem enged meg argumentumot\n" #: lib/getopt.c:588 lib/getopt.c:593 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s: a(z) \"%c%s\" kapcsoló nem enged meg argumentumot\n" +msgstr "%s: a(z) „%c%s” kapcsoló nem enged meg argumentumot\n" #: lib/getopt.c:636 lib/getopt.c:655 lib/getopt.c:971 lib/getopt.c:990 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: a(z) \"%s\" kapcsolóhoz argumentum szükséges\n" +msgstr "%s: a(z) „%s” kapcsolóhoz argumentum szükséges\n" #: lib/getopt.c:693 lib/getopt.c:696 #, c-format msgid "%s: unrecognized option `--%s'\n" -msgstr "%s: a(z) \"--%s\" kapcsoló ismeretlen\n" +msgstr "%s: a(z) „--%s” kapcsoló ismeretlen\n" #: lib/getopt.c:704 lib/getopt.c:707 #, c-format msgid "%s: unrecognized option `%c%s'\n" -msgstr "%s: a(z) \"%c%s\" kapcsoló ismeretlen\n" +msgstr "%s: a(z) „%c%s” kapcsoló ismeretlen\n" #: lib/getopt.c:759 lib/getopt.c:762 #, c-format @@ -188,23 +188,23 @@ msgstr "%s: a kapcsoló egy argumentumot igényel -- %c\n" #: lib/getopt.c:892 lib/getopt.c:908 #, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s: a \"-W %s\" kapcsoló nem egyértelmű\n" +msgstr "%s: a „-W %s” kapcsoló nem egyértelmű\n" #: lib/getopt.c:932 lib/getopt.c:950 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s: a \"-W %s\" kapcsoló nem enged meg argumentumot\n" +msgstr "%s: a „-W %s” kapcsoló nem enged meg argumentumot\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "elfogyott a memória" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "A munkakönyvtár nem jegyezhető fel" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "a visszatérés meghiúsult a kiinduló munkakönyvtárba" @@ -285,12 +285,12 @@ msgstr[1] "%s: Csak %lu bájt került kiírásra, összesen %lu bájtból" #: lib/paxnames.c:155 #, c-format msgid "Removing leading `%s' from member names" -msgstr "A kezdő \"%s\" eltávolítása a nevek elejéről" +msgstr "A kezdő „%s” eltávolítása a nevek elejéről" #: lib/paxnames.c:156 #, c-format msgid "Removing leading `%s' from hard link targets" -msgstr "A kezdő \"%s\" eltávolítása a közvetlen linkek céljaiból" +msgstr "A kezdő „%s” eltávolítása a közvetlen linkek céljaiból" #: lib/paxnames.c:169 msgid "Substituting `.' for empty member name" @@ -321,17 +321,29 @@ msgstr "Egy . helyettesítése a közvetlen link üres célja helyett" #. and use glyphs suitable for your language. #: lib/quotearg.c:266 msgid "`" -msgstr "\"" +msgstr "”" #: lib/quotearg.c:267 msgid "'" -msgstr "\"" - -#: lib/rpmatch.c:69 +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=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[iIyY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -505,7 +517,7 @@ msgstr "Nem foglalható hely a puffernek" #: rmt/rmt.c:304 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "További információkért adja ki a \"%s --help\" parancsot.\n" +msgstr "További információkért adja ki a „%s --help” parancsot.\n" #: rmt/rmt.c:308 #, c-format @@ -556,104 +568,104 @@ msgstr "Idő előtti fájlvége" msgid "Garbage command" msgstr "Fölösleges parancs" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Ez nem úgy néz ki, mint egy tar archívum" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Kiírt bájtok teljes száma" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Olvasott bájtok teljes száma" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Törölt bájtok teljes száma: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(cső)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "A record_size értéke érvénytelen" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Nem adott meg archívumnevet" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Nem ellenőrizhető az archívum, ha a szabványos be/kimenetet használja" -#: src/buffer.c:517 +#: src/buffer.c:536 #, 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:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Tömörített archívumok nem frissíthetők" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "A szalag eleje, most kilépek" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Túl sok hiba, kilépek" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "az rmtlseek nem állt meg egy rekord határán" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: érvénytelen kötetszámot tartalmaz" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Kötetszám-túlcsordulás" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF ahol a program felhasználói választ várt" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "FIGYELMEZTETÉS: Az archívum befejezetlen" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -664,66 +676,67 @@ msgstr "" " q A Tar megszakítása\n" " y vagy újsor A művelet folytatása\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Új parancsértelmező hívása\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Ezen lista kiírása\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Nincs új kötet, kilépés.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Nincs megadva fájlnév, próbálkozzon újra.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, 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:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" -msgstr "A(z) \"%s\" parancs meghiúsult" +msgstr "A(z) „%s” parancs meghiúsult" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s nem folytatódik ezen a köteten" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s mérete hibás (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ez a kötet túl van a sorozaton" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, 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:1276 +#: src/buffer.c:1304 #, 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:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -731,6 +744,11 @@ 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:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "az rmtlseek nem állt meg egy rekord határán" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -742,8 +760,8 @@ msgstr[1] "Csak %lu bájt olvasható %lu bájtból" msgid "Contents differ" msgstr "A tartalom eltér" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Váratlan EOF az archívumban" @@ -793,7 +811,7 @@ msgstr "Ellenőrzés " #, 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" +"%s: A(z) „%c” fájltípus ismeretlen, a diffelés normális fájlként történt" #: src/compare.c:524 msgid "Archive contains file names with leading prefixes removed." @@ -864,7 +882,7 @@ msgstr[1] "%s: a fájl zsugorítva %s bájtra, nullákkal kerül kitöltésre" 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "a tartalom nem került kiírásra" @@ -876,7 +894,7 @@ msgstr "%s: Ismeretlen fájltípus, fájl a figyelmen kívül hagyva" #: src/create.c:1464 #, c-format msgid "Missing links to %s.\n" -msgstr "Hiányzó linkek a következőre: \"%s\".\n" +msgstr "Hiányzó linkek a következőre: „%s”.\n" #: src/create.c:1535 #, c-format @@ -893,7 +911,7 @@ msgstr "%s: a fájl az archívumban van, nem kerül kiírásra" msgid "%s: File removed before we read it" msgstr "%s: a fájl el lett távolítva a beolvasás előtt" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "a könyvtár nem került kiírásra" @@ -944,170 +962,170 @@ msgstr "%s: a könyvtár átnevezésre került az állapotának kinyerése előt msgid "Extracting contiguous files as regular files" msgstr "A folytonos fájlok kibontása normál fájlként" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Kísérlet a szimbolikus linkek kibontására közvetlen linkként" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "%s olvasása\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Váratlan hosszú névfejléc" -#: src/extract.c:1159 +#: src/extract.c:1156 #, 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" +msgstr "%s: Ismeretlen fájltípus: „%c”, normál fájlként lesz kibontva" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" -msgstr "A jelenlegi \"%s\" újabb vagy egyező korú" +msgstr "A jelenlegi „%s” újabb vagy egyező korú" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nem sikerült biztonsági mentést készíteni erről a fájlról" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "%s: Nem nevezhető át a következőre: %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "A hiba nem hozható helyre: kilépés" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: A könyvtár át lett nevezve a következőről: %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: a könyvtár át lett nevezve" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: a könyvtár új" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Érvénytelen időbélyeg" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Érvénytelen módosítási idő (másodperc)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Érvénytelen módosítási idő (nanomásodperc)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Érvénytelen eszközszám" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Érvénytelen inode-szám" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Túl hosszú mező a pillanatképfájl olvasása közben" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Olvasási hiba a pillanatképfájlban" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Váratlan fájlvége a pillanatképfájlban" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Váratlan mezőérték a pillanatképfájlban" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Hiányzó rekordlezáró" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Hibás növekményes fájlformátum" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nem támogatott növekményes formátumverzió: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, 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ó" +"Rosszul formázott kiíratási könyvtár: a várt „%c” helyett %#3o található" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" -msgstr "Rosszul formázott kiíratási könyvtár: az \"X\" többször szerepel" +msgstr "Rosszul formázott kiíratási könyvtár: az „X” többször szerepel" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "Rosszul formázott kiíratási könyvtár: üres név az \"R\"-ben" +msgstr "Rosszul formázott kiíratási könyvtár: üres név az „R”-ben" -#: src/incremen.c:1405 +#: src/incremen.c:1465 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\"" +msgstr "Rosszul formázott kiíratási könyvtár: a „T”-t nem előzi meg az „R”" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "Rosszul formázott kiíratási könyvtár: üres név a \"T\"-ben" +msgstr "Rosszul formázott kiíratási könyvtár: üres név a „T”-ben" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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 " +"Rosszul formázott kiíratási könyvtár: a várt „%c” helyett az adatok vége " "található" -#: src/incremen.c:1437 +#: src/incremen.c:1497 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" +"Rosszul formázott kiíratási könyvtár: az „X” soha nem került felhasználásra" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, 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:1543 +#: src/incremen.c:1603 #, 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:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s törlése\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: nem távolítható el" @@ -1127,20 +1145,20 @@ msgstr "blokk %s: ** A blokk üres **\n" msgid "block %s: ** End of File **\n" msgstr "blokk %s: ** A fájl vége **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blokk %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1148,69 +1166,69 @@ msgstr "" "feltételezi, hogy kettes komplemens" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Az archívum elavulófélben levő base-64-es fejléceket tartalmaz" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " link a következőre: %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " ismeretlen fájltípus: %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Hosszú link--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Hosszú név--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Kötetfejléc--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Folytatva %s bájttól--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Könyvtár létrehozása:" @@ -1247,26 +1265,26 @@ msgstr "folyamatközi csatorna" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Mintaillesztő karaktereket használt a fájlnevekben. " -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" "Használja a --wildcards kapcsolót a mintaillesztés engedélyezéséhez vagy a --" "no-wildcards kapcsolót " -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "ezen figyelmeztetés elnyomásához." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nem található az archívumban" -#: src/names.c:621 +#: src/names.c:615 #, 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" @@ -1275,7 +1293,7 @@ msgstr "%s: A szükséges előfordulás nem található az archívumban" #, c-format 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" +"A(z) „-%s” és a(z) „-%s” kapcsolók mind a szabványos bemenetet igénylik" #: src/tar.c:156 #, c-format @@ -1291,10 +1309,10 @@ msgstr "GNU szolgáltatásokat kértél inkompatibilis az archívumformátumokon 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." +"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:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1304,7 +1322,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 "" -"A GNU \"tar\" több fájlt egyetlen szalagos vagy lemezes archívumba ment és " +"A GNU „tar” több fájlt egyetlen szalagos vagy lemezes archívumba ment és " "képes az egyes fájlokat helyreállítani az archívumból.\n" "\n" "Például:\n" @@ -1315,7 +1333,7 @@ msgstr "" " tar -xf archívum.tar # Kibontja az összes fájlt az archívum.tar\n" " fájlból.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1326,8 +1344,7 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -" A biztonsági mentés utótagja \"~\", hacsak nem változtatja meg a \"--suffix" -"\"\n" +" A biztonsági mentés utótagja „~”, hacsak nem változtatja meg a „--suffix”\n" "vagy a SIMPLE_BACKUP_SUFFIX segítségével.\n" "A verziófelügyelet a --backup vagy a VERSION_CONTROL segítségével " "kezelheti,\n" @@ -1338,88 +1355,88 @@ msgstr "" " egyébként egyszerű\n" " never, simple mindig egyszerű mentés létrehozása\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Fő működési mód:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "felsorolja egy archívum tartalmát" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "fájlok kibontása egy archívumból" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "új archívum létrehozása" -#: src/tar.c:379 +#: src/tar.c:381 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:382 +#: src/tar.c:384 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:384 +#: src/tar.c:386 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:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "tar fájlok hozzáfűzése egy archívumhoz" -#: src/tar.c:389 +#: src/tar.c:391 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:391 +#: src/tar.c:393 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:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Műveletmódosítók:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "ritka fájlok hatékony kezelése" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "MAGAS[.ALACSONY]" -#: src/tar.c:401 +#: src/tar.c:403 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:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "régi GNU formátumú növekményes mentés kezelése" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FÁJL" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "új GNU formátumú növekményes mentés kezelése" -#: src/tar.c:407 +#: src/tar.c:409 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:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "SZÁM" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1432,117 +1449,119 @@ msgstr "" "átadásra a parancssoron vagy a -T kapcsolón keresztül. A SZÁM " "alapértelmezett értéke az 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "az archívum kereshető" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "ne ellenőrizze az eszközszámokat növekményes archívumok létrehozásakor" -#: src/tar.c:420 +#: src/tar.c:422 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:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Felülírás felügyelete:" -#: src/tar.c:429 +#: src/tar.c:431 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:431 +#: src/tar.c:433 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:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "ne cserélje a meglévő fájlokat kibontáskor" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "meglévő fájlok felülírása kibontáskor" -#: src/tar.c:439 +#: src/tar.c:441 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:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "hierarchiák kiürítése könyvtár kibontása előtt" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "meglévő könyvtárak metaadatainak megőrzése" -#: src/tar.c:445 +#: src/tar.c:447 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:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Kimeneti adatfolyam kiválasztása:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "fájlok kibontása a szabványos kimenetre" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "PARANCS" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "kibontott fájlok továbbítása másik program számára" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "utódok kilépési kódjainak figyelmen kívül hagyása" -#: src/tar.c:460 +#: src/tar.c:462 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:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Fájlattribútumok kezelése:" -#: src/tar.c:468 +#: src/tar.c:470 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:470 +#: src/tar.c:472 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:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DÁTUM-VAGY-FÁJL" -#: src/tar.c:472 +#: src/tar.c:474 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:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "MÓDOSÍTÁSOK" -#: src/tar.c:474 +#: src/tar.c:476 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:476 +#: src/tar.c:478 msgid "METHOD" msgstr "MÓDSZER" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1552,29 +1571,29 @@ 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:481 +#: src/tar.c:483 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:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "próbálja azonos tulajdonossal kibontani a fájlokat" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "fájlok kibontása az Ön nevében" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "mindig számok használata a felhasználó- vagy csoportnevekhez" -#: src/tar.c:489 +#: src/tar.c:491 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:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1582,15 +1601,15 @@ 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:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "kibontandó nevek rendezése, az archívumnak való megfelelés érdekében" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "azonos, mint a -p és -s egyszerre" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1598,139 +1617,139 @@ 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:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "a --delay-directory-restore kapcsoló hatásának megszüntetése" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Eszköz kiválasztása és váltása:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHÍVUM" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "az ARCHÍVUM archívumfájl vagy -eszköz használata" -#: src/tar.c:513 +#: src/tar.c:515 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:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "az adott rmt PARANCS használata az rmt helyett" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "a távoli PARANCS használata az rsh helyett" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "meghajtó és sűrűség megadása" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "többkötetes archívum létrehozása/listázása/kibontása" -#: src/tar.c:537 +#: src/tar.c:539 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:539 +#: src/tar.c:541 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:542 +#: src/tar.c:544 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:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Eszközblokkolás:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOKK" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "rekordonként BLOKK x 512 bájt" -#: src/tar.c:552 +#: src/tar.c:554 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:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "nullázott blokkok (EOF) mellőzése az archívumban" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "újrablokkolás olvasáskor (4.2BSD csövekhez)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Archívumformátum kiválasztása:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMÁTUM" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "az adott formátumú archívum létrehozása" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "A FORMÁTUM a következők egyike:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "régi V7 tar formátum" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "A tar <= 1.12 által használt GNU formátum" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x formátum" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) formátum" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) formátum" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "azonos a pax formátummal" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "azonos a --format=v7 formátummal" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "azonos a --format=posix formátummal" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "kulcsszó[[:]=érték][,kulcsszó[[:]=érték]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "a pax kulcsszavak irányítása" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "SZÖVEG" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1738,87 +1757,101 @@ 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:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Tömörítési kapcsolók:" -#: src/tar.c:594 +#: src/tar.c:596 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:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use 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:601 msgid "filter the archive through bzip2" msgstr "az archívum tömörítése a bzip2 használatával" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "az archívum tömörítése a gzip használatával" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "az archívum tömörítése a compress használatával" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "az archívum tömörítése az lzma használatával" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "az archívum tömörítése a gzip használatával" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 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:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Helyi fájlválasztás:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "KÖNYVTÁR" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "váltás a KÖNYVTÁR könyvtárba" -#: src/tar.c:619 +#: src/tar.c:626 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:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "a -T nullal lezárt neveket olvas, letiltja a -C kapcsolót" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" "a -T segítségével beolvasott fájlnevek idézettségének megszüntetése " "(alapértelmezett)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "ne szüntesse meg a -T segítségével beolvasott fájlnevek idézettségét" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "MINTA" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "a MINTAKÉNT megadott fájlok kihagyása" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "a FÁJLBAN megadott minták kihagyása" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1826,187 +1859,187 @@ msgstr "" "a CACHEDIR.TAG-et tartalmazó könyvtárak tartalmának kihagyása, a címkefájl " "kivételével" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak alatt minden kihagyása" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak kihagyása" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "a FÁJLT tartalmazó könyvtárak alatt minden kihagyása" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "a FÁJLT tartalmazó könyvtárak kihagyása" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "verziókezelő-könyvtárak kihagyása" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "ne lépjen be automatikusan a könyvtárakba" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "az archívum létrehozásakor maradjon a helyi fájlrendszeren" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "belépés a könyvtárakba rekurzívan (alapértelmezett)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" -msgstr "ne vágja le a kezdő \"/\" jelet a fájlnevekből" +msgstr "ne vágja le a kezdő „/” jelet a fájlnevekből" -#: src/tar.c:656 +#: src/tar.c:665 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:658 +#: src/tar.c:667 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "TAGNÉV" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "kezdés a TAGNÉV tagnál az archívumban" -#: src/tar.c:662 +#: src/tar.c:671 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:664 +#: src/tar.c:673 msgid "DATE" msgstr "DÁTUM" -#: src/tar.c:665 +#: src/tar.c:674 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:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "FELÜGYELET" -#: src/tar.c:667 +#: src/tar.c:676 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:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "KARAKTERLÁNC" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -"mentés eltávolítás előtt, a szokásos utótag (\"~\", hacsak a " +"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:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Fájlnév-átalakítások:" -#: src/tar.c:676 +#: src/tar.c:685 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:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "KIFEJEZÉS" -#: src/tar.c:679 +#: src/tar.c:688 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:684 +#: src/tar.c:694 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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "kis- és nagybetűk figyelmen kívül hagyása" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "a minták illesztése a fájlnevek elejére" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "a minták illesztése bármely / után (alapértelmezett kihagyáskor)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "kis- és nagybetűkre érzékeny illesztés (alapértelmezett)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "helyettesítő karakterek használata (alapértelmezett kihagyáskor)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "szó szerinti karakterlánc-illesztés" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "a helyettesítő karakterek nem illeszkednek a perjelre" -#: src/tar.c:701 +#: src/tar.c:711 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:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Informatív kimenet:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "feldolgozott fájlok bőbeszédű listázása" -#: src/tar.c:711 +#: src/tar.c:721 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:713 +#: src/tar.c:723 msgid "ACTION" msgstr "MÅ°VELET" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "a MÅ°VELET végrehajtása minden ellenőrzőponton" -#: src/tar.c:717 +#: src/tar.c:727 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:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SZIGNÁL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2018,27 +2051,27 @@ 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:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "a fájlmódosítási dátumok kiírása UTC szerint" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "bőbeszédű kimenet küldése a FÁJLBA" -#: src/tar.c:728 +#: src/tar.c:738 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:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "megerősítés kérése minden egyes művelethez" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "a tar alapértelmezéseinek megjelenítése" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2046,31 +2079,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:737 +#: src/tar.c:747 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:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STÍLUS" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "a KARAKTERLÁNCBÓL származó karakterek kiegészítő idézése" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "a KARAKTERLÁNCBÓL származó karakterek idézésének letiltása" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Kompatibilitási kapcsolók:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2078,56 +2111,56 @@ msgstr "" "létrehozáskor megegyezik a --old-archive kapcsolóval; kibontáskor a --no-" "same-owner kapcsolóval" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Egyéb kapcsolók:" -#: src/tar.c:761 +#: src/tar.c:771 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:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" -msgstr "A következő kapcsolók közül egynél többet nem használhat: \"-Acdtrux\"" +msgstr "A következő kapcsolók közül egynél többet nem használhat: „-Acdtrux”" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "A tömörítési kapcsolók ütköznek" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Ismeretlen szignálnév: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "A dátummintafájl nem található" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s cseréje az ismeretlen %s dátumformátumhoz" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" -msgstr "\"%s\" kapcsoló: A(z) \"%s\" dátum kezelése mint %s" +msgstr "„%s” kapcsoló: A(z) „%s” dátum kezelése mint %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: a fájllista már be van olvasva" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: a beolvasott fájlnév null karaktert tartalmaz" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "A --quoting-style kapcsolók érvényes argumentumai:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2135,155 +2168,169 @@ msgstr "" "\n" "*Ezen* tar alapértelmezései:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Érvénytelen blokkolási tényező" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" -"Figyelmeztetés: a \"-l\" kapcsoló nem támogatott; talán a \"-j\" vagy a \"-T" -"\" egyikére gondolt?" +"Figyelmeztetés: a „-l” kapcsoló nem támogatott; talán a „-j” vagy a „-T” " +"egyikére gondolt?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Érvénytelen szalagméret" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Egynél több küszöbdátum" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Érvénytelen ritka verzió érték" -#: src/tar.c:1552 +#: src/tar.c:1585 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:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "A --checkpoint értéke nem egy egész" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Érvénytelen csoport" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Érvénytelen mód került megadásra a kapcsolóban" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Érvénytelen szám" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Érvénytelen tulajdonos" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Érvénytelen rekordméret" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Érvénytelen elemszám" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Csak egy --to-command kapcsoló engedélyezett" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Rosszul formázott sűrűségargumentum: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" -msgstr "Ismeretlen sűrűség: \"%c\"" +msgstr "Ismeretlen sűrűség: „%c”" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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" +msgstr "A „-[0-7][lmh]” kapcsolókat *ez* a tar NEM támogatja" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FÁJL]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." -msgstr "A régi \"%c\" kapcsoló paramétert igényel." +msgstr "A régi „%c” kapcsoló paramétert igényel." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "a --occurrence értelmetlen fájllista nélkül" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "a --occurrence nem használható a kért működési módban" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" -msgstr "Több archívumfájl esetén szükséges a \"-M\" kapcsoló" +msgstr "Több archívumfájl esetén szükséges a „-M” kapcsoló" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "" "A --listed-incremental és a --newer kapcsolók nem használhatók egyszerre" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "A többkötetes archívumok nem ellenőrizhetők" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "A tömörített archívumok nem ellenőrizhetők" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Nem használhatók többkötetes tömörített archívumok" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Tömörített archívumok nem fűzhetők össze" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "a --pax kapcsoló csak POSIX archívumokon használható" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Üres archívum létrehozása visszautasítva" -#: src/tar.c:2343 +#: src/tar.c:2389 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:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" -msgstr "A következő kapcsolók közül egyikét meg kell adnia: \"-Acdtrux\"" +msgstr "A következő kapcsolók közül egyikét meg kell adnia: „-Acdtrux”" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "A hibás kilépés késleltetve a korábbi hibákból" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2292,84 +2339,84 @@ 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:158 +#: src/xheader.c:156 #, 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:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "A(z) %s minta nem használható" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "A(z) %s minta nem bírálható felül" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Rosszul formázott kiterjesztett fejléc: a hossz hiányzik" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "A kiterjesztett fejléc hossza kívül esik a tartományon" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" "Rosszul formázott kiterjesztett fejléc: a hossz után hiányzik egy üreshely " "karakter" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "A kiterjesztett fejléc hibás: egy egyenlőségjel hiányzik" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Rosszul formázott kiterjesztett fejléc: az újsor hiányzik" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -"A(z) \"%s\" ismeretlen kiterjesztett fejléc kulcsszó figyelmen kívül marad" +"A(z) „%s” ismeretlen kiterjesztett fejléc kulcsszó figyelmen kívül marad" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Rosszul formázott kiterjesztett fejléc: érvénytelen %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Rosszul formázott kiterjesztett fejléc: többlet %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, 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:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2549,98 +2596,115 @@ msgstr "A szám kívül esik az engedélyezett tartományon: %s" msgid "Negative size: %s" msgstr "Negatív méret: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "a stat(%s) meghiúsult" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" -msgstr "Hiba a(z) \"%s\" közelében található szám elemzésekor" +msgstr "Hiba a(z) „%s” közelében található szám elemzésekor" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Ismeretlen dátumformátum" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGUMENTUMOK...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" -msgstr "a(z) \"%s\" nem nyitható meg" +msgstr "a(z) „%s” nem nyitható meg" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "Nem lehet pozicionálni" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "a fájlnév null karaktert tartalmaz" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "nem állíthatók elő ritka fájlok a szabványos kimeneten, használja a --file " "kapcsolót" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" -msgstr "helytelen maszk (a(z) \"%s\" közelében)" +msgstr "helytelen maszk (a(z) „%s” közelében)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" -msgstr "Ismeretlen mező: \"%s\"" +msgstr "Ismeretlen mező: „%s”" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" -msgstr "nem állítható be az idő a következőn: \"%s\"" +msgstr "nem állítható be az idő a következőn: „%s”" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "A parancs sikeresen befejeződött\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "A parancs meghiúsult a következő állapottal: %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "A parancs befejeződött a következő szignállal: %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "A parancs leállítva a következő szignállal: %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "A parancs hibakeresési kimenetet adott vissza\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "A parancs befejeződött\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "a --stat fájlneveket igényel" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "túl sok argumentum" + +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "a --delay-directory-restore kapcsoló hatásának megszüntetése" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "A hibás kilépés késleltetve a korábbi hibákból" diff --git a/po/id.gmo b/po/id.gmo index 8b76ff6be636924f5ef65bbe7a850c7d870b5b38..7d38bc92180f226dc6d8b8235f56a34792d5ab84 100644 GIT binary patch literal 54614 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 vw72(N%b&bfzqdU0aKfO8Wl*@FBV) delta 5294 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, 1999, 2002. +# Arif E. Nugroho , 2008. # msgid "" msgstr "" -"Project-Id-Version: tar 1.13.25\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2002-07-24 22:02GMT+0700\n" -"Last-Translator: Tedi Heriyanto \n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-11-09 16:15+0700\n" +"Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 0.9.5\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: lib/argmatch.c:133 #, c-format msgid "invalid argument %s for %s" -msgstr "argumen tidak valid %s untuk %s" +msgstr "argumen %s untuk %s tidak valid" #: lib/argmatch.c:134 #, c-format msgid "ambiguous argument %s for %s" -msgstr "argumen rancu %s untuk %s" +msgstr "argumen %s untuk %s ambigu" #: lib/argmatch.c:153 #, c-format @@ -33,180 +35,177 @@ msgstr "Argumen yang valid adalah:" #: lib/argp-help.c:147 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -msgstr "" +msgstr "ARGP_HELP_FMT: %s nilai lebih kecil atau sama dengan %s" #: lib/argp-help.c:220 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" -msgstr "" +msgstr "%.*s: ARGP_HELP_FMT parameter membutuhkan sebuah nilai" #: lib/argp-help.c:226 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter must be positive" -msgstr "" +msgstr "%.*s: ARGP_HELP_FMT parameter harus positif" #: lib/argp-help.c:235 #, c-format msgid "%.*s: Unknown ARGP_HELP_FMT parameter" -msgstr "" +msgstr "%.*s: Parameter ARGP_HELP_FMT tidak diketahui" #: lib/argp-help.c:247 #, c-format msgid "Garbage in ARGP_HELP_FMT: %s" -msgstr "" +msgstr "Sampah dalam ARGP_HELP_FMT: %s" #: lib/argp-help.c:1246 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" +"Argumen wajib atau opsional ke opsi panjang juga wajib atau opsional untuk " +"argumen pendek yang berkorespondennya." #: lib/argp-help.c:1639 msgid "Usage:" -msgstr "" +msgstr "Penggunaan:" #: lib/argp-help.c:1643 msgid " or: " -msgstr "" +msgstr " atau: " #: lib/argp-help.c:1655 -#, fuzzy msgid " [OPTION...]" -msgstr "" -"\n" -"Gunakan: %s [OPTION]...\n" +msgstr " [OPSI...]" #: lib/argp-help.c:1682 -#, fuzzy, c-format +#, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" -msgstr "Ketik `%s --help' untuk informasi lebih lengkap.\n" +msgstr "Coba `%s --help' atau `%s --usage' untuk informasi lebih lanjut.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 -#, fuzzy, c-format +#: lib/argp-help.c:1710 src/tar.c:1255 +#, c-format msgid "Report bugs to %s.\n" -msgstr "" -"\n" -"Laporkan bug kepada .\n" +msgstr "Laporkan bug ke %s.\n" #: lib/argp-help.c:1929 lib/error.c:125 msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" -msgstr "" +msgstr "berikan daftar bantuan ini" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" -msgstr "" +msgstr "berikan sebuah pesan penggunaan singkat" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" -msgstr "" +msgstr "NAMA" #: lib/argp-parse.c:83 msgid "set the program name" -msgstr "" +msgstr "set nama aplikasi" #: lib/argp-parse.c:84 msgid "SECS" -msgstr "" +msgstr "SECS" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" -msgstr "" +msgstr "berhenti untuk DETIK detik (baku 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" -msgstr "" +msgstr "tampilkan versi aplikasi" #: lib/argp-parse.c:158 #, c-format msgid "(PROGRAM ERROR) No version known!?" -msgstr "" +msgstr "(APLIKASI ERROR) Tidak ada versi yang dikenal!?" #: lib/argp-parse.c:611 -#, fuzzy, c-format +#, c-format msgid "%s: Too many arguments\n" -msgstr "%s: option `%s' membutuhkan sebuah argumen\n" +msgstr "%s: Terlalu banyak argumen\n" #: lib/argp-parse.c:754 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "" +msgstr "(APLIKASI ERROR) Opsi seharusnya telah dikenali!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" -msgstr "" +msgstr "error menulis" #: lib/getopt.c:526 lib/getopt.c:542 #, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "%s: option `%s' rancu\n" +msgstr "%s: opsi `%s' ambigu\n" #: lib/getopt.c:575 lib/getopt.c:579 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s: option `--%s' tidak membolehkan sebuah argumen\n" +msgstr "%s: opsi `--%s' tidak mengijinkan sebuah argumen\n" #: lib/getopt.c:588 lib/getopt.c:593 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s: option `%c%s' tidak membolehkan sebuah argumen\n" +msgstr "%s: opsi `%c%s' tidak mengijinkan sebuah argumen\n" #: lib/getopt.c:636 lib/getopt.c:655 lib/getopt.c:971 lib/getopt.c:990 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: option `%s' membutuhkan sebuah argumen\n" +msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n" #: lib/getopt.c:693 lib/getopt.c:696 #, c-format msgid "%s: unrecognized option `--%s'\n" -msgstr "%s: option tidak dikenal `--%s'\n" +msgstr "%s: opsi tidak dikenal `--%s'\n" #: lib/getopt.c:704 lib/getopt.c:707 #, c-format msgid "%s: unrecognized option `%c%s'\n" -msgstr "%s: option tidak dikenal `%c%s'\n" +msgstr "%s: opsi tidak dikenal `%c%s'\n" #: lib/getopt.c:759 lib/getopt.c:762 #, c-format msgid "%s: illegal option -- %c\n" -msgstr "%s: option ilegal -- %c\n" +msgstr "%s: opsi -- %c tidak legal\n" #: lib/getopt.c:768 lib/getopt.c:771 #, c-format msgid "%s: invalid option -- %c\n" -msgstr "%s: option tidak valid -- %c\n" +msgstr "%s: opsi -- %c tidak valid\n" #: lib/getopt.c:823 lib/getopt.c:839 lib/getopt.c:1043 lib/getopt.c:1061 #, c-format msgid "%s: option requires an argument -- %c\n" -msgstr "%s: option membutuhkan sebuah argumen -- %c\n" +msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n" #: lib/getopt.c:892 lib/getopt.c:908 #, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s: option `-W %s' rancu\n" +msgstr "%s: opsi `-W %s' ambigu\n" #: lib/getopt.c:932 lib/getopt.c:950 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s: option `-W %s' tidak membolehkan sebuah argumen\n" +msgstr "%s: opsi `-W %s' tidak mengijinkan sebuah argumen\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" -msgstr "Memory habis" +msgstr "kehabisan memori" -#: lib/openat-die.c:33 -#, fuzzy, c-format +#: lib/openat-die.c:35 +#, c-format msgid "unable to record current working directory" -msgstr "Tidak bisa pindah direktori kerja" +msgstr "tidak dapat menyimpan direktori kerja sekarang" -#: lib/openat-die.c:46 -#, fuzzy, c-format +#: lib/openat-die.c:48 +#, c-format msgid "failed to return to initial working directory" -msgstr "Tidak dapat menyimpan direktori kerja" +msgstr "gagal untuk kembali ke direktori kerja inisial" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because @@ -242,18 +241,18 @@ msgid "%s: Cannot hard link to %s" msgstr "%s: Tidak dapat membuat hard link ke %s" #: lib/paxerror.c:179 lib/paxerror.c:211 -#, fuzzy, c-format +#, 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:Kesalahan pembacaan pada byte %s, terbaca %lu byte" -msgstr[1] "%s:Kesalahan pembacaan pada byte %s, terbaca %lu byte" +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 -#, fuzzy, c-format +#, 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: Kesalahan pembacaan pada byte %s, terbaca %lu byte" -msgstr[1] "%s: Peringatan: Kesalahan pembacaan pada byte %s, terbaca %lu byte" +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 #, c-format @@ -271,30 +270,29 @@ msgid "%s: Cannot create symlink to %s" msgstr "%s: Tidak dapat membuat symlink ke %s" #: lib/paxerror.c:349 -#, fuzzy, c-format +#, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" msgstr[0] "%s: Hanya dapat menulis %lu dari %lu byte" msgstr[1] "%s: Hanya dapat menulis %lu dari %lu byte" #: lib/paxnames.c:155 -#, fuzzy, c-format +#, c-format msgid "Removing leading `%s' from member names" -msgstr "Menghilangkan awalan `%.*s' dari nama anggota" +msgstr "Menghilangkan awalan `%s' dari nama anggota" #: lib/paxnames.c:156 -#, fuzzy, c-format +#, c-format msgid "Removing leading `%s' from hard link targets" -msgstr "Menghilangkan awalan `%.*s' dari nama anggota" +msgstr "Menghilangkan awalan `%s' dari target hard link" #: lib/paxnames.c:169 -#, fuzzy msgid "Substituting `.' for empty member name" -msgstr "Menghilangkan awalan `%.*s' dari nama anggota" +msgstr "Mengganti `.' untuk nama anggota kosong" #: lib/paxnames.c:170 msgid "Substituting `.' for empty hard link target" -msgstr "" +msgstr "Mengganti `.' untuk target hard link kosong" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -323,13 +321,25 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" -msgstr "" - -#: lib/rpmatch.c:72 +msgstr "^[yY]" + +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" -msgstr "" +msgstr "^[nN]" #: lib/rtapelib.c:299 #, c-format @@ -356,7 +366,7 @@ msgstr "Tidak dapat menjalankan remote shell" #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:65 msgid "(C)" -msgstr "" +msgstr "(C)" #: lib/version-etc.c:67 msgid "" @@ -367,24 +377,32 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Lisensi GPLv3+: GNU GPL versi 3 atau lebih \n" +"Ini adalah aplikasi bebas: anda bebas untuk mengubah dan " +"mendistribusikannya.\n" +"TIDAK ADA GARANSI disini, sampai batas yang diijinkan oleh hukum yang " +"berlaku.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:83 -#, fuzzy, c-format +#, c-format msgid "Written by %s.\n" -msgstr "Ditulis oleh F. Pinard" +msgstr "Ditulis oleh %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:87 -#, fuzzy, c-format +#, c-format msgid "Written by %s and %s.\n" -msgstr "Ditulis oleh F. Pinard" +msgstr "Ditulis oleh %s dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:91 -#, fuzzy, c-format +#, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "Ditulis oleh F. Pinard" +msgstr "Ditulis oleh %s, %s, dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -395,6 +413,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" +"Ditulis oleh %s, %s, %s,\n" +"dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -405,6 +425,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Ditulis oleh %s, %s, %s,\n" +"%s, dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -415,6 +437,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" +"Ditulis oleh %s, %s, %s,\n" +"%s, %s, dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -425,6 +449,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" +"Ditulis oleh %s, %s, %s,\n" +"%s, %s, %s, dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -436,6 +462,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" +"Ditulis oleh %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -447,6 +476,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Ditulis oleh %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, dan %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -458,14 +490,17 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"Ditulis oleh %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, dan yang lainnya.\n" #: rmt/rmt.c:142 msgid "Input string too long" -msgstr "" +msgstr "Masukan string terlalu panjang" #: rmt/rmt.c:161 msgid "Number syntax error" -msgstr "" +msgstr "Sintaks jumlah error" #: rmt/rmt.c:180 msgid "rmtd: Cannot allocate buffer space\n" @@ -478,10 +513,10 @@ msgstr "Tidak dapat mengalokasi buffer space" #: rmt/rmt.c:304 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "Ketik `%s --help' untuk informasi lebih lengkap.\n" +msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n" #: rmt/rmt.c:308 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION]\n" "Manipulate a tape drive, accepting commands from a remote process.\n" @@ -489,33 +524,32 @@ msgid "" " --version Output version info.\n" " --help Output this help.\n" msgstr "" -"Penggunaan: %s [OPTION]\n" +"Penggunaan: %s [OPSI]\n" "Manipulasi sebuah tape drive, menerima perintah dari proses remote.\n" "\n" -" --version Tampilkan info versi.\n" -" --help Tampilkan bantuan ini.\n" +" --version Tampilkan informasi versi.\n" +" --help Tampilkan bantuan ini.\n" #: rmt/rmt.c:315 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Report bugs to <%s>.\n" msgstr "" "\n" -"Laporkan bug kepada .\n" +"Laporkan bug ke <%s>.\n" #: rmt/rmt.c:397 -#, fuzzy msgid "Seek offset error" -msgstr "Offset pencarian di luar batasan" +msgstr "Offset pencarian error" #: rmt/rmt.c:406 rmt/rmt.c:547 rmt/rmt.c:557 msgid "Seek offset out of range" -msgstr "Offset pencarian di luar batasan" +msgstr "Offset pencarian di luar jangkauan" #: rmt/rmt.c:428 msgid "Seek direction out of range" -msgstr "Arah pencarian di luar batasan" +msgstr "Arah pencarian di luar jangkauan" #: rmt/rmt.c:472 msgid "rmtd: Premature eof\n" @@ -523,186 +557,193 @@ msgstr "rmtd: EOF prematur\n" #: rmt/rmt.c:474 msgid "Premature end of file" -msgstr "Akhir file prematur" +msgstr "Akhir dari berkas prematur" #: rmt/rmt.c:672 msgid "Garbage command" -msgstr "Command tidak terpakai" +msgstr "Perintah sampah" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" -msgstr "Sepertinya bukan tar archive" +msgstr "Ini sepertinya bukan sebuah tar archive" -#: src/buffer.c:333 src/buffer.c:342 -#, fuzzy +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" -msgstr "Total byte ditulis: %s (%sB, %sB/s)\n" +msgstr "Total byte ditulis" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" -msgstr "" +msgstr "Total byte dibaca" -#: src/buffer.c:344 -#, fuzzy, c-format +#: src/buffer.c:363 +#, c-format msgid "Total bytes deleted: %s\n" -msgstr "Total byte ditulis: %s (%sB, %sB/s)\n" +msgstr "Total byte dihapus: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" -msgstr "Nilai record_size salah" +msgstr "Nilai record_size tidak valid" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Tidak diberikan nama archive" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" -msgstr "Tidak dapat verifikasi stdin/stdout archive" +msgstr "Tidak dapat memverifikasi stdin/stdout archive" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" -msgstr "" +msgstr "Archive terkompres. Gunakan %s opsi" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Tidak dapat update compressed archives" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" -msgstr "Berada pada awal tape, keluar" +msgstr "Berada pada awal tape, berhenti sekarang" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" -msgstr "Terlalu banyak kesalahan, keluar" - -#: src/buffer.c:678 -#, fuzzy, 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" +msgstr "Terlalu banyak errors, berhenti" -#: src/buffer.c:698 -#, fuzzy, c-format +#: src/buffer.c:695 +#, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" -msgstr "" +msgstr "rmtlseek tidak dapat berhenti di sebuah batas rekaman" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: berisi nomor volum yang tidak valid" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Nomor volum overflow" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Mempersiapkan volume #%d untuk %s dan tekan return: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF pada saat user reply diharapkan" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "PERINGATAN: Archive tidak lengkap" -#: src/buffer.c:934 -#, fuzzy, c-format +#: src/buffer.c:954 +#, 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 [name] Memberi nama baru pada file untuk volume selanjutnya\n" -" q Batalkan tar\n" -" ! Spawn subshell\n" -" ? Cetak keterangn ini\n" +" n nama Memberi sebuah nama berkas baru untuk volume selanjutnya (dan " +"seterusnya)\n" +" q Batalkan tar\n" +" y or newline Lanjutkan operasi\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" -msgstr "" +msgstr " ! Spawn sebuah subshell\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" -msgstr "" +msgstr " ? Tampilkan daftar ini\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Tidak ada new volume; keluar.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" -msgstr "" +msgstr "Nama berkas tidak dispesifikasikan. Coba lagi.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" -msgstr "" +msgstr "Masukan tidak valid. Ketik ? untuk bantuan.\n" -#: src/buffer.c:1044 -#, fuzzy, c-format +#: src/buffer.c:1064 +#, c-format msgid "%s command failed" -msgstr "Perintah `%s' gagal" +msgstr "Perintah %s gagal" -#: src/buffer.c:1199 -#, fuzzy, c-format +#: src/buffer.c:1219 +#, c-format msgid "%s is possibly continued on this volume: header contains truncated name" -msgstr "%s tidak dilanjutkan pada volume ini" +msgstr "%s mungkin dilanjutkan di volume ini: header berisi nama terpotong" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" -msgstr "%s tidak dilanjutkan pada volume ini" +msgstr "%s tidak dilanjutkan di volume ini" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s adalah ukuran yang salah (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Volume ini di luar urutan" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" -msgstr "Label archive tidak cocok dengan '%s'" +msgstr "Label archive tidak cocok dengan %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Volume %s tidak sesuai dengan %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +"%s: nama berkas terlalu panjang untuk diurutkan dalam sebuah GNU multivolume " +"header, dipotong" + +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek tidak dapat berhenti di sebuah batas rekaman" #: src/compare.c:96 -#, fuzzy, c-format +#, c-format msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Hanya dapat membaca %lu dari %lu byte" @@ -712,14 +753,14 @@ msgstr[1] "Hanya dapat membaca %lu dari %lu byte" msgid "Contents differ" msgstr "Isi berbeda" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Unexpected EOF dalam archive" #: src/compare.c:180 src/compare.c:196 src/compare.c:314 src/compare.c:412 msgid "File type differs" -msgstr "Tipe file berbeda" +msgstr "Tipe berkas berbeda" #: src/compare.c:183 src/compare.c:203 src/compare.c:328 msgid "Mode differs" @@ -752,7 +793,7 @@ msgstr "Symlink berbeda" #: src/compare.c:322 msgid "Device number differs" -msgstr "Nomor device berbeda" +msgstr "Nomor perangkat berbeda" #: src/compare.c:462 #, c-format @@ -760,79 +801,80 @@ msgid "Verify " msgstr "Verifikasi " #: src/compare.c:469 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type `%c', diffed as normal file" -msgstr "%s:File type '%c' tidak dikenal, lakukan diff sebagai file normal" +msgstr "%s: Tipe berkas '%c' tidak dikenal, lakukan diff sebagai berkas normal" #: src/compare.c:524 msgid "Archive contains file names with leading prefixes removed." -msgstr "" +msgstr "Archive berisi nama berkas dengan awalan dihapus." #: src/compare.c:526 msgid "Verification may fail to locate original files." -msgstr "" +msgstr "Verifikasi mungkin gagal untuk menemukan berkas orisinil." #: src/compare.c:596 -#, fuzzy, c-format +#, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" -msgstr[0] "GAGAL VERIFIKASI: ditemukan %d invalid header" -msgstr[1] "GAGAL VERIFIKASI: ditemukan %d invalid header" +msgstr[0] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi" +msgstr[1] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi" #: src/compare.c:612 src/list.c:144 #, c-format msgid "A lone zero block at %s" -msgstr "" +msgstr "Sebuah lone blok nol di %s" #: src/create.c:67 #, c-format msgid "%s: contains a cache directory tag %s; %s" -msgstr "" +msgstr "%s: berisi sebuah cache direktori tag %s; %s" #: src/create.c:272 #, c-format msgid "value %s out of %s range %s..%s; substituting %s" -msgstr "nilai %s dari %s di luar daerah %s..%s; mengganti %s" +msgstr "nilai %s dari %s di luar jangkauan %s..%s; menggantikan %s" #: src/create.c:278 #, c-format msgid "value %s out of %s range %s..%s" -msgstr "nilai %s dari %s di luar daerah %s..%s" +msgstr "nilai %s dari %s di luar dari jangkauan %s..%s" #: src/create.c:338 msgid "Generating negative octal headers" msgstr "Membuat header oktal negatif" #: src/create.c:624 src/create.c:687 -#, fuzzy, c-format +#, c-format msgid "%s: file name is too long (max %d); not dumped" -msgstr "%s: file tidak berubah; tidak di-dump" +msgstr "%s: nama berkas terlalu panjang (maksimal %d); tidak di-dump" #: src/create.c:634 -#, fuzzy, c-format +#, c-format msgid "%s: file name is too long (cannot be split); not dumped" -msgstr "%s: file tidak berubah; tidak di-dump" +msgstr "" +"%s: nama berkas terlalu panjang (tidak dapat memisahkan); tidak di-dump" #: src/create.c:661 -#, fuzzy, c-format +#, c-format msgid "%s: link name is too long; not dumped" -msgstr "%s: file tidak berubah; tidak di-dump" +msgstr "%s: nama link terlalu panjang; tidak di-dump" #: src/create.c:1076 -#, 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: File diperkecil %s byte, dipadding dengan nol" -msgstr[1] "%s: File diperkecil %s byte, dipadding dengan nol" +msgstr[0] "%s: File diperkecil %s byte; dipadding dengan nol" +msgstr[1] "%s: File diperkecil %s byte; dipadding dengan nol" #: src/create.c:1177 #, 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" -msgstr "" +msgstr "isi tidak didump" #: src/create.c:1361 #, c-format @@ -840,33 +882,33 @@ msgid "%s: Unknown file type; file ignored" msgstr "%s: Tipe file tidak dikenal; file diabaikan" #: src/create.c:1464 -#, fuzzy, c-format +#, c-format msgid "Missing links to %s.\n" -msgstr " link ke %s\n" +msgstr "Hilang link ke %s.\n" #: src/create.c:1535 #, c-format msgid "%s: file is unchanged; not dumped" -msgstr "%s: file tidak berubah; tidak di-dump" +msgstr "%s: berkas tidak berubah; tidak di-dump" #: src/create.c:1543 #, c-format msgid "%s: file is the archive; not dumped" -msgstr "%s: file adalah archive; tidak di-dump" +msgstr "%s: berkas adalah archive; tidak di-dump" #: src/create.c:1573 #, c-format msgid "%s: File removed before we read it" msgstr "%s: File dihapus sebelum kita membacanya" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" -msgstr "" +msgstr "direktori tidak didump" #: src/create.c:1659 #, c-format msgid "%s: file changed as we read it" -msgstr "%s: file berubah saat kita membacanya" +msgstr "%s: berkas berubah saat kita membacanya" #: src/create.c:1739 #, c-format @@ -889,12 +931,12 @@ msgstr "Menghapus non-header dari archive" #: src/extract.c:198 #, c-format msgid "%s: implausibly old time stamp %s" -msgstr "" +msgstr "%s: implausibly penanda waktu lama %s" #: src/extract.c:215 -#, fuzzy, c-format +#, c-format msgid "%s: time stamp %s is %s s in the future" -msgstr "%s: time stamp %s adalah %lu dalam masa datang" +msgstr "%s: penanda %s adalah %s dalam masa datang" #: src/extract.c:395 #, c-format @@ -910,168 +952,166 @@ msgstr "%s: Direktori diganti nama sebelum statusnya dapat diperoleh" msgid "Extracting contiguous files as regular files" msgstr "Sedang extract contiguous file sebagai regular file" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Mencoba extract symbolic link sebagai hard link" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Membaca %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" -msgstr "%s: Tidak dapat mengekstrak -- file adalah kelanjutan dari volume lain" +msgstr "" +"%s: Tidak dapat mengekstrak -- berkas adalah kelanjutan dari volume lain" -#: src/extract.c:1153 src/list.c:1081 -#, fuzzy +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" -msgstr "Unexpected EOF dalam mangled names" +msgstr "Tidak terduga nama header panjang" -#: src/extract.c:1159 -#, fuzzy, c-format +#: src/extract.c:1156 +#, c-format msgid "%s: Unknown file type `%c', extracted as normal file" -msgstr "%s: Tipe file tidak dikenal '%c', diekstraksi sebagai file normal" +msgstr "%s: Tipe berkas tidak dikenal '%c', diekstraksi sebagai berkas normal" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" -msgstr "" +msgstr "Saat ini %s adalah lebih baru atau berumuran sama" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" -msgstr "%s: Tidak dapat melakukan backup file ini" +msgstr "%s: Tidak dapat melakukan backup berkas ini" -#: src/extract.c:1358 -#, fuzzy, c-format +#: src/extract.c:1355 +#, c-format msgid "Cannot rename %s to %s" -msgstr "%s:Tidak dapat mengganti nama ke %s" +msgstr "Tidak dapat mengubah nama %s ke %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" -msgstr "Kesalahan tidak dapat diperbaiki, keluar" +msgstr "Error tidak dapat diperbaiki: keluar sekarang" -#: src/incremen.c:390 src/incremen.c:430 -#, fuzzy, c-format +#: src/incremen.c:445 src/incremen.c:489 +#, c-format msgid "%s: Directory has been renamed from %s" -msgstr "%s: Direktori telah diganti nama" +msgstr "%s: Direktori telah diubah nama dari %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah diganti nama" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktori adalah baru" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Time stamp tidak valid" -#: src/incremen.c:889 -#, fuzzy +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" -msgstr "Mode tidak tepat diberikan pada opsi" +msgstr "Waktu modifikasi (detik) tidak valid" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" -msgstr "" +msgstr "waktu modifikasi (nano detik) tidak valid" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" -msgstr "Nomor device tidak valid" +msgstr "Nomor perangkat tidak valid" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Nomor inode tidak valid" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" -msgstr "" +msgstr "Field terlalu panjang ketika membaca berkas snapshot" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" -msgstr "" +msgstr "Pembacaan error dalam berkas snapshot" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 -#, fuzzy +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" -msgstr "Unexpected EOF dalam archive" +msgstr "Tidak terduga EOF dalam berkas snapshot" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" -msgstr "" +msgstr "Tidak terduga nilai field dalam berkas snapshot" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" -msgstr "" +msgstr "Hilang pengakhir rekaman" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" -msgstr "" +msgstr "Format berkas incremental buruk" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" -msgstr "" +msgstr "Versi format incremental tidak didukung: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" -msgstr "" +msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" -msgstr "" +msgstr "Salah bentuk dumpdir: 'X' terduplikasi" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "" +msgstr "Salah bentuk dumpdir: nama kosong dalam 'R'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" -msgstr "" +msgstr "Salah bentuk dumpdir: 'T' tidak diawali oleh 'R'" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "" +msgstr "Salah bentuk dumpdir: nama kosong dalam 'T'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" -msgstr "" +msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan akhir dari data" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" -msgstr "" +msgstr "Salah bentuk dumpdir: 'X' tidak pernah digunakan" -#: src/incremen.c:1481 -#, fuzzy, c-format +#: src/incremen.c:1541 +#, c-format msgid "Cannot create temporary directory using template %s" -msgstr "Tidak dapat mengalokasi memori untuk faktor blocking %d" +msgstr "Tidak dapat membuat direktori sementara menggunakan template %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" -msgstr "" +msgstr "%s: Tidak menghapus direktori: tidak dapat memperoleh statistik" -#: src/incremen.c:1556 -#, fuzzy, c-format +#: src/incremen.c:1616 +#, c-format msgid "%s: directory is on a different device: not purging" -msgstr "%s: file berada pada filesistem yang berbeda; tidak di-dump" +msgstr "%s: direktori berada di perangkat yang berbeda: tidak menghapus" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Menghapus %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Tidak dapat menghapus" @@ -1079,98 +1119,98 @@ msgstr "%s: Tidak dapat menghapus" #: src/list.c:113 #, c-format msgid "%s: Omitting" -msgstr "%s: Menghilangkan" +msgstr "%s: Mengabaikan" #: src/list.c:131 #, c-format msgid "block %s: ** Block of NULs **\n" -msgstr "blok %s: ** Block NULs **\n" +msgstr "blok %s: ** Blok dari KOSONG **\n" #: src/list.c:155 #, c-format msgid "block %s: ** End of File **\n" -msgstr "blok %s: ** Akhir file **\n" +msgstr "blok %s: ** Akhir dari Berkas **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, c-format msgid "Blanks in header where numeric %s value expected" -msgstr "Blank dalam header saat diharapkan nilai %s numerik" +msgstr "Kosong dalam header saat diharapkan nilai %s numerik" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Nilai oktal arsip %.*s di luar batasan %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arsip berisikan header base-64 yang kadaluarsas" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " link ke %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " tipe file tidak dikenal %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" -msgstr "" +msgstr "--Link Panjang--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" -msgstr "" +msgstr "--Nama Panjang--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Volume Header--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Diteruskan pada byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Membuat direktori:" @@ -1207,37 +1247,39 @@ msgstr "saluran interproses" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," -msgstr "" +msgstr "Pola pencocokan karakter digunakan dalam nama berkas. Mohon," -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" +"gunakan --wildcards untuk mengaktifkan pencocokan pola, atau --no-wildcards " +"untuk" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." -msgstr "" +msgstr "menekan peringatan ini." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Tidak ditemukan dalam archive" -#: src/names.c:621 -#, fuzzy, c-format +#: src/names.c:615 +#, c-format msgid "%s: Required occurrence not found in archive" -msgstr "%s: Tidak ditemukan dalam archive" +msgstr "%s: Kejadian yang diinginkan tidak ditemukan dalam archive" #: src/tar.c:79 #, c-format msgid "Options `-%s' and `-%s' both want standard input" -msgstr "Opsi `-%s' dan `-%s' membutuhkan standard input" +msgstr "Opsi `-%s' dan `-%s' membutuhkan standard masukan" #: src/tar.c:156 -#, fuzzy, c-format +#, c-format msgid "%s: Invalid archive format" -msgstr "%s: grup tidak valid" +msgstr "%s: Format archive tidak valid" #: src/tar.c:180 msgid "GNU features wanted on incompatible archive format" @@ -1248,9 +1290,10 @@ msgstr "Feature GNU dibutuhkan untuk format archive yang tidak kompatibel" msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" +"Gaya quoting `%s' tidak diketahui. Coba `%s --quoting-style=help' untuk " +"memperoleh daftar." -#: src/tar.c:334 -#, fuzzy +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1260,17 +1303,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" -"Penggunaan: %s [OPTION]... [FILE]...\n" +"GNU `tar' menyimpan beberapa berkas bersama dalam sebuah tape tunggal atau " +"disk archive, dan dapat dikembalikan ke berkas individu dari archive " +"tersebut.\n" "\n" "Contoh:\n" -" %s -cf archive.tar foo bar # Buat archive.tar dari file foo dan bar.\n" -" %s -tvf archive.tar # Tampilkan semua file dalam archive.tar " +" tar -cf archive.tar foo bar # Buat archive.tar dari berkas foo dan bar.\n" +" tar -tvf archive.tar # Tampilkan semua berkas dalam archive.tar " "secara rinci.\n" -" %s -xf archive.tar # Bongkar semua file dari archive.tar.\n" +" tar -xf archive.tar # Bongkar semua berkas dari archive.tar.\n" -#: src/tar.c:343 -#, fuzzy +#: src/tar.c:345 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 " @@ -1281,1261 +1324,1338 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"\n" "Akhiran dari backup adalah `~', kecuali bila diset dengan --suffix atau " "SIMPLE_BACKUP_SUFFIX.\n" -"Version control dapat diset dengan -backup atau VERSION_CONTROL, nilainya:\n" +"Version control dapat diset dengan --backup atau VERSION_CONTROL, nilainya:\n" "\n" -" t, numbered gunakan numbered backups\n" -" nil, existing beri nomor bila nomor backup telah ada, simple sebaliknya\n" -" never, simple selalu buat simple backups\n" +" none, off tidak pernah membuat backups\n" +" t, numbered membuat backups bernomor\n" +" nil, existing beri nomor bila nomor backup telah ada, sederhana " +"sebaliknya\n" +" never, simple selalu buat sederhana backups\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" -msgstr "" +msgstr "Mode operasi utama:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" -msgstr "" +msgstr "daftar isi dari sebuah archive" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" -msgstr "" +msgstr "ekstrak berkas dari sebuah archive" -#: src/tar.c:377 -#, fuzzy +#: src/tar.c:379 msgid "create a new archive" -msgstr "Unexpected EOF dalam archive" +msgstr "buat sebuah archive baru" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" -msgstr "" +msgstr "cari perbedaan diantara archive dan sistem berkas" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" -msgstr "" +msgstr "tambahkan berkas ke akhir dari sebuah archive" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" -msgstr "" +msgstr "hanya tambahkan berkas yang lebih bari dari salinan dalam archive" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" -msgstr "" +msgstr "tambahkan berkas tar ke sebuah archive" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" -msgstr "" +msgstr "hapus dari archive (bukan dalam pita mag!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" -msgstr "" +msgstr "test label volume archive dan keluar" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" -msgstr "" +msgstr "Pemodifikasi operasi:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" -msgstr "" +msgstr "tangani berkas sparse secara efisien" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" -msgstr "" +msgstr "MAJOR[.MINOR]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" +"set versi dari format sparse untuk digunakan (mengimplikasikan --sparse)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" -msgstr "" +msgstr "tangani format GNU lama incremental backup" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" -msgstr "" +msgstr "BERKAS" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" -msgstr "" +msgstr "tangani format GNU barus incremental backup" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" -msgstr "" +msgstr "jangan keluar dengan bukan nol dalam berkas tidak dapat dibaca" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" -msgstr "" +msgstr "NOMOR" -#: src/tar.c:409 +#: src/tar.c:411 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 "" +"proses hanya JUMLAH pertemuan dari setiap berkas dalam archive; opsi ini " +"hanya berlaku dalam konjungsi dengan satu dari sub perintah --delete, --" +"diff, --extract atau --list dan ketika sebuah daftar dari berkas diberikan " +"baik dalam baris perintah atau melalui opsi -T; JUMLAH baku ke 1" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" -msgstr "" +msgstr "pencarian tidak dapat dilakukan dalam archive" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" +"tidak dapat memeriksa nomor perangkat ketika membuat archive incremental" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" -msgstr "" +msgstr "periksa nomor perangkat ketika membuat incremental archive (baku)" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" -msgstr "" +msgstr "Overwrite kontrol:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" -msgstr "" +msgstr "mencoba untuk memverifikasi archive setelah menulisnya" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" -msgstr "" +msgstr "hapus berkas setelah menambahkannya ke archive" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" -msgstr "" +msgstr "jangan timpa berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" -msgstr "" +msgstr "overwrite berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" -msgstr "" +msgstr "hapus setiap berkas sebelum mengekstrak diatasnya" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" -msgstr "" +msgstr "kosongkan susunan sebelum mengekstrak ke direktori" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" -msgstr "" +msgstr "jaga metadata dari direktori yang sudah ada" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" +"overwrite metadata dari direktori yang sudah ada ketika mengekstrak (baku)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" -msgstr "" +msgstr "Pilih stream keluaran:" -#: src/tar.c:454 -#, fuzzy +#: src/tar.c:456 msgid "extract files to standard output" -msgstr "Kesalahan dalam menulis ke output standar" +msgstr "ekstrak berkas ke standar keluaran" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" -msgstr "" +msgstr "PERINTAH" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" -msgstr "" +msgstr "pipe berkas terekstrak ke aplikasi lain" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" -msgstr "" +msgstr "abaikan kode keluaran dari anak" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" -msgstr "" +msgstr "perlakukan kode keluaran bukan nol dari anak sebagai error" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" -msgstr "" +msgstr "Penanganan dari atribut berkas:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" -msgstr "" +msgstr "paksa NAMA sebagai pemilik untuk berkas yang ditambahkan" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" -msgstr "" +msgstr "paksa NAMA sebagai grup untuk berkas yang ditambahkan" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" -msgstr "" +msgstr "DATE-ATAU-BERKAS" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" -msgstr "" +msgstr "set mtime untuk berkas yang ditambahkan dari DATE-OR-FILE" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" -msgstr "" +msgstr "PERUBAHAN" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" -msgstr "" +msgstr "paksa PERUBAHAN (simbolik) mode untuk berkas yang ditambahkan" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" -msgstr "" +msgstr "METODE" -#: src/tar.c:477 +#: src/tar.c:479 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 "" +"jaga waktu akses di berkas yang didump, baik dengan mengembalikan waktu " +"setelah membaca (METODE='replace'; baku) atau dengan tidak menset waktu di " +"tempat pertama (METODE='system')" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" -msgstr "" +msgstr "jangan ekstrak waktu modifikasi berkas" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" -msgstr "" +msgstr "mencoba mengekstrak berkas dengan kepemilikan yang sama" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" -msgstr "" +msgstr "ekstrak berkas seperti dirimu" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" -msgstr "" +msgstr "selalu gunakan nomor untuk nama pengguna/grup" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" -msgstr "" +msgstr "ekstrak informasi mengenai ijin berkas (baku untuk superuser)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" +"aplikasikan umask pengguna ketika mengekstrak ijin dari archive (baku untuk " +"pengguna biasa)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" -msgstr "" +msgstr "urutkan nama untuk mengekstrak supaya cocok dengan archive" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" -msgstr "" +msgstr "sama seperti baik -p dan -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" +"tunda konfigurasi waktu modifikasi dan ijin untuk direktori terekstrak " +"sampai akhir dari ekstrasi" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" -msgstr "" +msgstr "batalkan efek dari opsi --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" -msgstr "" +msgstr "Pemilihan dan pengubahan perangkat:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" -msgstr "" +msgstr "ARCHIVE" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" -msgstr "" +msgstr "gunakan berkas archive atau perangkat ARCHIVE" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" -msgstr "" +msgstr "berkas archive adalah lokal walaupun ini memiliki sebuah kolon" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" -msgstr "" +msgstr "gunakan PERINTAH rmt yang diberikan daripad rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" -msgstr "" +msgstr "gunakan PERINTAH remote daripada rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" -msgstr "" +msgstr "spesifikasikan drive dan kepadatan" -#: src/tar.c:535 -#, fuzzy +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" -msgstr "Tidak dapat verifikasi multi-volume archives" +msgstr "buat/daftar/ekstrak multi-volume archive" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" -msgstr "" +msgstr "ubah pita setelah menulis ANGKA x 1024 bytes" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" -msgstr "" +msgstr "jalankan script di akhir dari setiap pite (mengimplikasikan -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" -msgstr "" +msgstr "gunakan/update jumlah volume dalam BERKAS" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" -msgstr "" +msgstr "Bloking perangkat:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" -msgstr "" +msgstr "BLOK" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" -msgstr "" +msgstr "BLOK x 512 byte per detik" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" -msgstr "" +msgstr "JUMLAH dari byte per rekaman, kelipatan dari 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" -msgstr "" +msgstr "abaikan blok yang dinolkan dalam archive (berarti EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" -msgstr "" +msgstr "reblok saat kita baca (untuk 4.2BSD pipes)" -#: src/tar.c:561 -#, fuzzy +#: src/tar.c:563 msgid "Archive format selection:" -msgstr "Opsi format archive konflik" +msgstr "Pemilihan format archive:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" -msgstr "" +msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" -msgstr "" +msgstr "buat archive dari format yang diberikan" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" -msgstr "" +msgstr "FORMAT adalah satu dari berikut:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" -msgstr "" +msgstr "format tar lama V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" -msgstr "" +msgstr "format gnu tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" -msgstr "" +msgstr "format GNU tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" -msgstr "" +msgstr "format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" -msgstr "" +msgstr "format POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" -msgstr "" +msgstr "sama seperti pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" -msgstr "" +msgstr "sama seperti --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" -msgstr "" +msgstr "sama seperti --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." -msgstr "" +msgstr "kata kunci[[:]=nilai][,kata kunci[[:]=nilai]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" -msgstr "" +msgstr "kontrol kata kunci pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" -msgstr "" +msgstr "TEKS" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" - -#: src/tar.c:592 -#, fuzzy -msgid "Compression options:" -msgstr "Opsi kompresi konflik" +"buat archive dengan nama volume TEKS; di waktu daftar/ekstrak, gunakan TEKS " +"sebagai sebuah pola globbing untuk nama volume" #: src/tar.c:594 -msgid "use archive suffix to determine the compression program" -msgstr "" +msgid "Compression options:" +msgstr "Opsi kompresi:" #: src/tar.c:596 -msgid "filter the archive through bzip2" -msgstr "" +msgid "use archive suffix to determine the compression program" +msgstr "gunaka nama akhiran archive untuk menentukan aplikasi kompresi" #: src/tar.c:598 #, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "gunaka nama akhiran archive untuk menentukan aplikasi kompresi" + +#: src/tar.c:601 +msgid "filter the archive through bzip2" +msgstr "saring archive melalui bzip2" + +#: src/tar.c:603 msgid "filter the archive through gzip" -msgstr "%s: file adalah archive; tidak di-dump" +msgstr "saring archive melalui gzip" -#: src/tar.c:602 -#, fuzzy +#: src/tar.c:607 msgid "filter the archive through compress" -msgstr "%s: file adalah archive; tidak di-dump" +msgstr "saring archive melalui compress" -#: src/tar.c:605 -#, fuzzy +#: src/tar.c:610 msgid "filter the archive through lzma" -msgstr "%s: file adalah archive; tidak di-dump" +msgstr "saring archive melalui lzma" + +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "saring archive melalui gzip" -#: src/tar.c:606 +#: src/tar.c:613 msgid "PROG" -msgstr "" +msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" -msgstr "" +msgstr "saring melalui PROG (harus menerima -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" -msgstr "" +msgstr "Pemilihan berkas lokal:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" -msgstr "" +msgstr "DIR" -#: src/tar.c:617 -#, fuzzy +#: src/tar.c:624 msgid "change to directory DIR" -msgstr "Tidak bisa pindah direktori kerja" +msgstr "pindah ke direktori DIR" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" -msgstr "" +msgstr "dapatkan nama untuk ekstrak atau buat dari BERKAS" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" +msgstr "-T baca nama berakhiran kosong, non-aktifkan -C" + +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:623 +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" -msgstr "" +msgstr "unquote nama berkas baca dengan -T (baku)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" -msgstr "" +msgstr "jangan unquote nama berkas baca dengan -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" -msgstr "" +msgstr "POLA" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" -msgstr "" +msgstr "jangan masukan berkas, berikan sebagai sebuah POLA" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" -msgstr "" +msgstr "jangan masukan pola yang terdaftar dalam BERKAS" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" +"jangan masukan isi dari direktori berisi CACHEDIR.TAG, kecuali untuk berkas " +"tag itu sendiri" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "" +msgstr "jangan masukan apapun dibawah direktori berisi CACHEDIR.TAG" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" -msgstr "" +msgstr "jangan masukan direktori berisi CACHEDIR.TAG" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" -msgstr "" +msgstr "jangan masukan apapun dibawah direktori berisi BERKAS" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" -msgstr "" +msgstr "jangan masukan direktori berisi BERKAS" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" -msgstr "" +msgstr "jangan masukan direktori sistem pengontrol direktori" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" -msgstr "" +msgstr "hindari penurunan secara otomatis dalam direktori" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" -msgstr "" +msgstr "tetap dalam sistem berkas lokal ketika membuat archive" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" -msgstr "" +msgstr "rekursif kedalam direktori (baku)" -#: src/tar.c:654 -#, fuzzy +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" -msgstr "Menghilangkan awalan `%.*s' dari nama anggota" +msgstr "jangan hilangkan awalan `/' dari nama berkas" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" -msgstr "" +msgstr "ikuti symlinks; berkas archive dan dump yang mereka tunjuk ke" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" -msgstr "" +msgstr "ikuti hard links; berkas archive dan dump yang mereka refer ke" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" -msgstr "" +msgstr "NAMA-ANGGOTA" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" -msgstr "" +msgstr "berawal di anggota NAMA-ANGGOTA dalam archive" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" -msgstr "" +msgstr "hanya simpan berkas lebih baru dari DATE-OR-FILE" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" -msgstr "" +msgstr "TANGGAL" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" -msgstr "" +msgstr "bandingkan tanggal dan waktu hanya ketika data berubah" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" -msgstr "" +msgstr "KONTROL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" -msgstr "" +msgstr "backup sebelum penghapusan, pilih PENGONTROL versi" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" -msgstr "" +msgstr "STRING" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" +"backup sebelum penghapusan, override akhiran biasa ('~' kecuali di override " +"oleh variabel lingkungan SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" -msgstr "" +msgstr "Transformasi nama berkas:" -#: src/tar.c:676 +#: src/tar.c:685 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:678 +#: src/tar.c:687 msgid "EXPRESSION" -msgstr "" +msgstr "EKSPRESI" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" -msgstr "" +msgstr "gunakan sed EKSPRESI replace untuk mengubah nama berkas" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" -msgstr "" +msgstr "Opsi nama berkas cocok (mempengaruhi baik pola exclude dan include):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" -msgstr "" +msgstr "abaikan perbedaan huruf besar dan huruf kecil" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" -msgstr "" +msgstr "pencocokan pola nama berkas mulai" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" -msgstr "" +msgstr "pencocokan polah setelah `/' apapun (baku untuk exclusion)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" -msgstr "" +msgstr "pencocokan dengan memperhatikan huruf besar dan huruf kecil (baku)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" -msgstr "" +msgstr "gunakan wildcards (baku untuk exclusion)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" -msgstr "" +msgstr "pencocok verbatim string" -#: src/tar.c:699 -#, fuzzy +#: src/tar.c:709 msgid "wildcards do not match `/'" -msgstr "Volume %s tidak sesuai dengan %s" +msgstr "wildcards tidak cocok `/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" -msgstr "" +msgstr "wildcards cocok `/' (baku untuk exclusion)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" -msgstr "" +msgstr "Keluaran informative:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" -msgstr "" +msgstr "proses daftar berkas secara verbose" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" -msgstr "" +msgstr "tampilkan pesan perkembangan setiap rekaman ke ANGKA (baku 10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" -msgstr "" +msgstr "AKSI" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" -msgstr "" +msgstr "jalankan AKSI disetiap titik pemeriksaan" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" -msgstr "" +msgstr "tampilkan sebuah pesan jika tidak seluruh link didump" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" -msgstr "" +msgstr "SINYAL" -#: src/tar.c:719 +#: src/tar.c:729 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 "" +"tampilkan total bytes setelah memproses archive; dengan sebuah archive - " +"tampilkan total bytes ketika SINYAL ini dikirimkan; Sinyal yang diijinkan " +"adalah: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 dan SIGUSR2; nama tanpa awalah SIG " +"juga diterima" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" -msgstr "" +msgstr "tampilkan waktu modifikasi berkas dalam UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" -msgstr "" +msgstr "kirim keluaran verbose ke BERKAS" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" -msgstr "" +msgstr "tampilkan jumlah blok didalam archive dengan setiap pesan" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" -msgstr "" +msgstr "minta konfirmasi untuk setiap aksi" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" -msgstr "" +msgstr "tampilkan tar baku" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" +"ketika mendaftar atau mengekstrak, daftar setiap direktori yang tidak cocok " +"dengan kriteria pencarian" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" -msgstr "" +msgstr "tampilkan berkas atau nama berkas setelah transformasi" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" -msgstr "" +msgstr "GAYA" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" -msgstr "" +msgstr "set nama quoting gaya; lihat dibawah untuk nilai GAYA yang valid" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" -msgstr "" +msgstr "sebagai tambahan karakter quote dari STRING" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" -msgstr "" +msgstr "non-aktifkan quoting untuk karakter dari STRING" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" -msgstr "" +msgstr "Opsi yang kompatibel:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" +"ketika membuat, sama seperti --old-archive; ketika mengekstrak, sama seperti " +"--no-same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" -msgstr "" +msgstr "Opsi lain:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" -msgstr "" +msgstr "non-aktifkan penggunaan dari opsi berbahaya yang berpotensial" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Anda tidak bisa menjalankan lebih dari satu opsi `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Opsi kompresi konflik" -#: src/tar.c:965 -#, fuzzy, c-format +#: src/tar.c:985 +#, c-format msgid "Unknown signal name: %s" -msgstr " tipe file tidak dikenal %s\n" +msgstr "Nama sinyal: %s tidak dikenal" -#: src/tar.c:989 -#, fuzzy +#: src/tar.c:1009 msgid "Date sample file not found" -msgstr "Tanggal file tidak ditemukan" +msgstr "Tanggal contoh berkas tidak ditemukan" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Menggantikan %s untuk format tanggal tidak dikenal %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" -msgstr "" +msgstr "Opsi %s: memperlakukan tanggal `%s' sebagai %s" -#: src/tar.c:1096 -#, fuzzy, c-format +#: src/tar.c:1119 +#, c-format msgid "%s: file list already read" -msgstr "%s: file adalah archive; tidak di-dump" +msgstr "%s: daftar berkas telah dibaca" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" -msgstr "" +msgstr "%s: nama berkas yang dibaca berisi karakter nul" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" -msgstr "" +msgstr "Argumen yang valid untuk opsi --quoting-style adalah:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" +"\n" +"*Ini* tar baku ke:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Faktor bloking tidak valid" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Peringatan: option -l tidak didukung; mungkin maksud anda -j atau -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Panjang tape tidak valid" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Lebih dari satu treshold date" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" -msgstr "" +msgstr "Nilai versi sparse tidak valid" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" -msgstr "" +msgstr "opsi --atime-preserve='system' tidak didukung di platform ini" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" -msgstr "" +msgstr "nilai --checkpoint bukan sebuah integer" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: grup tidak valid" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Mode tidak tepat diberikan pada opsi" -#: src/tar.c:1738 -#, fuzzy +#: src/tar.c:1775 msgid "Invalid number" -msgstr "Nomor inode tidak valid" +msgstr "Nomor tidak valid" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Pemilik tidak valid" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Ukuran record tidak valid" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Jumlah record harus kelipatan dari %d." -#: src/tar.c:1834 -#, fuzzy +#: src/tar.c:1873 msgid "Invalid number of elements" -msgstr "Panjang tape tidak valid" +msgstr "Jumlah dari elemen tidak valid" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" -msgstr "" +msgstr "Hanya satu opsi --to-command yang diijinkan" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" -msgstr "" +msgstr "Salah bentuk kepadatan argumen: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" -msgstr "" +msgstr "Kepadatan tidak diketahui: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Opsi `-[0-7][lmh]' tidak didukung oleh tar *ini*" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." -msgstr "" +msgstr "[BERKAS]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Opsi 'lama' `%c' membutuhkan argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" -msgstr "" +msgstr "--occurrence tidak berarti tanpa sebuah daftar berkas" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" -msgstr "" +msgstr "--occurrence tidak dapat digunakan dalam mode operasi yang diminta" -#: src/tar.c:2232 -#, fuzzy +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" -msgstr "File multiple archive membutuhkan opsi '-M'" +msgstr "Berkas multiple archive membutuhkan opsi '-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Tidak dapat menggabungkan --listed-incremental dengan --newer" -#: src/tar.c:2254 -#, fuzzy, c-format +#: src/tar.c:2293 +#, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Tidak dapat verifikasi multi-volume archives" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Tidak dapat verify compressed archives" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Tidak dapat menggunakan multi-volume compressed archives" -#: src/tar.c:2281 -#, fuzzy +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Tidak dapat update compressed archives" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" +msgstr "--pax-option hanya dapat digunakan dalam archive POSIX" + +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" -msgstr "Tidak bisa membuat archive yang kosong" +msgstr "Secara takut menolak untuk membuat sebuah archive kosong" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opsi '-Aru' tidak kompatibel dengan `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Anda harus menggunakan salah satu dari opsi `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Kesalahan exit ditunda dari error sebelumnya" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 -#, fuzzy, c-format +#, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: file mengecil sebanyak %s byte" msgstr[1] "%s: file mengecil sebanyak %s byte" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" -msgstr "" +msgstr "Kata kunci %s tidak diketahui atau belum diimplementasikan" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" -msgstr "" +msgstr "Pola %s tidak dapat digunakan" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" -msgstr "" +msgstr "Kata kunci %s tidak dapat dioverride" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" -msgstr "" +msgstr "Salah bentuk ekstensi header: hilang panjang" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" -msgstr "" +msgstr "Ekstensi panjang header diluar dari jangkauan yang diijinkan" -#: src/xheader.c:513 -#, fuzzy, c-format +#: src/xheader.c:511 +#, c-format msgid "Extended header length %*s is out of range" -msgstr "Arsip yang ditandatangahi dengan string base-64 %s di luar batasan %s" +msgstr "Ekstensi panjang header %*s diluar dari jangkauan" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" -msgstr "" +msgstr "Salah bentuk ekstensi header: hilang blank setelah panjang" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" -msgstr "" +msgstr "Salah bentuk ekstensi header: hilang tanda sama dengan" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" -msgstr "" +msgstr "Salah bentuk ekstensi header: hilang baris baru" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" -msgstr "" +msgstr "Mengabaikan kata kunci ekstensi `%s' yang tidak diketahui" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" +"Pasangan kata kunci/nilai yang dihasilkan terlalu panjang (kata kunci=%s, " +"panjang=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 -#, fuzzy, c-format +#: src/xheader.c:810 +#, c-format msgid "Extended header %s=%s is out of range %s..%s" -msgstr "Nilai arsip %s dari %s di luar batasan %s..%s" +msgstr "Ekstensi header %s=%s diluar dari jangkauan %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" -msgstr "" +msgstr "Salah bentuk ekstensi header: tidak valid %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" -msgstr "" +msgstr "Salah bentuk ekstensi header: kelebihan %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "" +msgstr "Salah bentuk ekstensi header: tidak valid %s: tidak diduga pembatas %c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" -msgstr "" +msgstr "Salah bentuk ekstensi header: tidak valid %s: jumlah dari nilai ganjil" #: src/checkpoint.c:107 -#, fuzzy, c-format +#, c-format msgid "%s: not a valid timeout" -msgstr "%s: grup tidak valid" +msgstr "%s: bukan sebuah kehabisan waktu yang valid" #: src/checkpoint.c:112 #, c-format msgid "%s: unknown checkpoint action" -msgstr "" +msgstr "%s: aksi titik pemeriksaan tidak diketahui" #: src/checkpoint.c:132 msgid "write" -msgstr "" +msgstr "tulis" #: src/checkpoint.c:132 msgid "read" -msgstr "" +msgstr "baca" #. 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:222 -#, fuzzy, c-format +#, c-format msgid "Write checkpoint %u" -msgstr "Menulis checkpoint %d" +msgstr "Menulis titik pemeriksaan %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:228 -#, fuzzy, c-format +#, c-format msgid "Read checkpoint %u" -msgstr "Membaca checkpoint %d" +msgstr "Membaca titik pemeriksaan %u" #: tests/genfile.c:111 -#, fuzzy msgid "" "genfile manipulates data files for GNU paxutils test suite.\n" "OPTIONS are:\n" -msgstr "Hasilkan file data untuk GNU test suite.\n" +msgstr "" +"genfile memanipulasi berkas data untuk suite pemeriksaan GNU paxutils.\n" +"OPSI adalah:\n" #: tests/genfile.c:126 -#, fuzzy msgid "File creation options:" -msgstr "Opsi kompresi konflik" +msgstr "Opsi pembuatan berkas:" #: tests/genfile.c:127 tests/genfile.c:138 msgid "SIZE" -msgstr "" +msgstr "UKURAN" #: tests/genfile.c:128 msgid "Create file of the given SIZE" -msgstr "" +msgstr "Buat berkas dari UKURAN yang diberikan" #: tests/genfile.c:130 -#, fuzzy msgid "Write to file NAME, instead of standard output" -msgstr "Kesalahan dalam menulis ke output standar" +msgstr "Tulis ke berkas NAMA, daripada ke standar keluaran" #: tests/genfile.c:132 msgid "Read file names from FILE" -msgstr "" +msgstr "Baca nama berkas dari BERKAS" #: tests/genfile.c:134 msgid "-T reads null-terminated names" -msgstr "" +msgstr "-T baca nama berakhiran null" #: tests/genfile.c:136 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" -msgstr "" +msgstr "Isi berkas dengan POLA yang diberikan. POLA adalah 'baku' atau 'nol'" #: tests/genfile.c:139 msgid "Size of a block for sparse file" -msgstr "" +msgstr "Ukuran dari sebuah blok untuk berkas sparse" #: tests/genfile.c:141 msgid "Generate sparse file. Rest of the command line gives the file map." -msgstr "" +msgstr "Buat berkas sparse. Sisa dari baris perintah memberikan peta berkas." #: tests/genfile.c:143 msgid "OFFSET" -msgstr "" +msgstr "OFSET" #: tests/genfile.c:144 msgid "Seek to the given offset before writing data" -msgstr "" +msgstr "Cari ke ofset yang diberikan sebelum menulis data" #: tests/genfile.c:150 msgid "File statistics options:" -msgstr "" +msgstr "Opsi statistik berkas:" #: tests/genfile.c:153 msgid "Print contents of struct stat for each given file. Default FORMAT is: " msgstr "" +"Tampilkan isi dari statistik struk untuk setiap berkas yang diberikan. " +"FORMAT baku adalah: " #: tests/genfile.c:160 msgid "Synchronous execution options:" -msgstr "" +msgstr "opsi eksekusi synchronous:" #: tests/genfile.c:163 msgid "" "Execute given COMMAND. Useful with --checkpoint and one of --cut, --append, " "--touch" msgstr "" +"Jalankan PERINTAH yang diberikan. Berguna dengan --checkpoint dan satu dari " +"--cut, --append, --touch" #: tests/genfile.c:166 msgid "Perform given action (see below) upon reaching checkpoint NUMBER" msgstr "" +"Lakukan aksi yang diberikan (lihat dibawah) ketika mencapai titik " +"pemeriksaan NOMOR" #: tests/genfile.c:169 msgid "Set date for next --touch option" -msgstr "" +msgstr "Set tanggal untuk opsi --touch selanjutnya" #: tests/genfile.c:172 msgid "Display executed checkpoints and exit status of COMMAND" msgstr "" +"Tampilkan titik pemeriksaan yang dijalankan dan status keluar dari PERINTAH" #: tests/genfile.c:177 msgid "" "Synchronous execution actions. These are executed when checkpoint number " "given by --checkpoint option is reached." msgstr "" +"Aksi eksekusi synchronous. Ini dijalankan ketika titik pemeriksaan nomor " +"yang diberikan oleh opsi --checkpoint dicapai." #: tests/genfile.c:180 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" msgstr "" +"Potong BERKAS ke ukuran yang dispesifikasikan oleh opsi --length sebelumnya " +"(atau 0, jika ini tidak diberikan)" #: tests/genfile.c:184 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." msgstr "" +"Tambahkan UKURAN bytes ke BERKAS. UKURAN yang diberikan oleh opsi --length " +"sebelumnya." #: tests/genfile.c:187 msgid "Update the access and modification times of FILE" -msgstr "" +msgstr "Update waktu akses dan modifikasi dari BERKAS" #: tests/genfile.c:190 msgid "Execute COMMAND" -msgstr "" +msgstr "Jalankan PERINTAH" #: tests/genfile.c:240 -#, fuzzy, c-format +#, c-format msgid "Invalid size: %s" -msgstr "Time stamp tidak valid" +msgstr "Ukuran: %s tidak valid" #: tests/genfile.c:245 -#, fuzzy, c-format +#, c-format msgid "Number out of allowed range: %s" -msgstr "Nomor inode di luar batasan" +msgstr "Jumlah diluar dari jangkauan yang diijinkan: %s" #: tests/genfile.c:248 #, c-format msgid "Negative size: %s" -msgstr "" +msgstr "Ukuran negatif: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" +msgstr "stat(%s) gagal" + +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:268 #, c-format -msgid "Error parsing number near `%s'" +msgid "created file is not sparse" msgstr "" -#: tests/genfile.c:361 -#, fuzzy, c-format +#: tests/genfile.c:353 +#, c-format +msgid "Error parsing number near `%s'" +msgstr "Error parsing nomor didekat `%s'" + +#: tests/genfile.c:359 +#, c-format msgid "Unknown date format" -msgstr "Kesalahan sistem tidak dikenal" +msgstr "Format tanggal tidak diketahui" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" -msgstr "" +msgstr "[ARG...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" -msgstr "" +msgstr "tidak dapat membuka `%s'" -#: tests/genfile.c:427 -#, fuzzy +#: tests/genfile.c:425 msgid "cannot seek" -msgstr "Tidak dapat menutup" +msgstr "Tidak dapat mencari" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" -msgstr "" +msgstr "nama berkas berisi karakter null" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" +"tidak dapat menghasilkan berkas sparse di standar keluaran, gunakan opsi --" +"file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" -msgstr "" +msgstr "mask tidak benar (didekat `%s')" -#: tests/genfile.c:593 tests/genfile.c:626 -#, fuzzy, c-format +#: tests/genfile.c:591 tests/genfile.c:624 +#, c-format msgid "Unknown field `%s'" -msgstr " tipe file tidak dikenal %s\n" +msgstr "Field `%s' tidak diketahui" -#: tests/genfile.c:653 -#, fuzzy, c-format +#: tests/genfile.c:651 +#, c-format msgid "cannot set time on `%s'" -msgstr "%s: Tidak dapat mencari ke %s" +msgstr "tidak dapat menset waktu di `%s'" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" -msgstr "" +msgstr "Perintah keluar secara sukses\n" -#: tests/genfile.c:809 -#, fuzzy, c-format +#: tests/genfile.c:807 +#, c-format msgid "Command failed with status %d\n" -msgstr "Child berhenti dengan signal %d" +msgstr "Perintah gagal dengan status %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" -msgstr "" +msgstr "Perintah berakhir di sinyal %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" -msgstr "" +msgstr "Perintah berhenti di sinyal %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" -msgstr "" +msgstr "Perintah memberika core dump\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" -msgstr "" +msgstr "Perintah berakhir\n" -#: tests/genfile.c:853 -#, fuzzy, c-format +#: tests/genfile.c:851 +#, c-format msgid "--stat requires file names" -msgstr "--Mangled file names--\n" +msgstr "--stat membutuhkan nama berkas" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" -msgstr "" +msgstr "terlalu banyak argumen" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Kesalahan exit ditunda dari error sebelumnya" #~ msgid "block size" #~ msgstr "ukuran blok" diff --git a/po/it.gmo b/po/it.gmo index f548fefee304fa2619457b175e9cccab6d943b5a..49aeb33903bbbb899e355c8aea84f1d0bb59c87c 100644 GIT binary patch literal 55988 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 delta 11549 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, 1996. # Marco d'Itri , 1998. +# Milo Casagrande , 2008 # msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.14.91\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2004-12-23 11:32+0100\n" -"Last-Translator: Marco d'Itri \n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-11-12 19:30+0100\n" +"Last-Translator: Milo Casagrande \n" "Language-Team: Italian \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" @@ -34,7 +37,7 @@ msgstr "Gli argomenti validi sono:" #: lib/argp-help.c:147 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -msgstr "" +msgstr "ARGP_HELP_FMT: il valore %s è minore o uguale a %s" #: lib/argp-help.c:220 #, c-format @@ -42,9 +45,9 @@ msgid "%.*s: ARGP_HELP_FMT parameter requires a value" msgstr "%.*s: il parametro ARGP_HELP_FMT richiede un valore" #: lib/argp-help.c:226 -#, fuzzy, c-format +#, c-format msgid "%.*s: ARGP_HELP_FMT parameter must be positive" -msgstr "%.*s: il parametro ARGP_HELP_FMT richiede un valore" +msgstr "%.*s: il parametro ARGP_HELP_FMT deve essere positivo" #: lib/argp-help.c:235 #, c-format @@ -61,8 +64,8 @@ msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -"Gli argomenti obbligatori o opzionali per le opzioni lunghe lo sono anche " -"per quelle corte." +"Gli argomenti obbligatori o facoltativi per le opzioni estese lo sono anche " +"per le corrispondenti opzioni brevi." #: lib/argp-help.c:1639 msgid "Usage:" @@ -79,9 +82,9 @@ msgstr " [OPZIONE...]" #: lib/argp-help.c:1682 #, 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 "Usare \"%s --help\" o \"%s --usage\" per ulteriori informazioni.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Segnalare i bug a %s.\n" @@ -90,90 +93,87 @@ msgstr "Segnalare i bug a %s.\n" msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" -#: lib/argp-parse.c:81 src/tar.c:763 -#, fuzzy +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "Mostra questo aiuto" -#: lib/argp-parse.c:82 src/tar.c:764 -#, fuzzy +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "Mostra un breve messaggio sull'uso" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NOME" #: lib/argp-parse.c:83 msgid "set the program name" -msgstr "" +msgstr "Imposta il nome del programma" #: lib/argp-parse.c:84 msgid "SECS" -msgstr "" +msgstr "SEC" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" -msgstr "" +msgstr "Resta in attesa per SEC secondi (predefinito 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 -#, fuzzy +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "Stampa la versione del programma" #: lib/argp-parse.c:158 #, c-format msgid "(PROGRAM ERROR) No version known!?" -msgstr "" +msgstr "(ERRORE DEL PROGRAMMA) Nessuna versione conosciuta." #: lib/argp-parse.c:611 -#, fuzzy, c-format +#, c-format msgid "%s: Too many arguments\n" -msgstr "%s: l'opzione `%s' richiede un argomento\n" +msgstr "%s: troppi argomenti\n" #: lib/argp-parse.c:754 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "" +msgstr "(ERRORE DEL PROGRAMMA) L'opzione dovrebbe essere stata riconosciuta." -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" -msgstr "" +msgstr "Errore di scrittura" #: lib/getopt.c:526 lib/getopt.c:542 #, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "%s: l'opzione `%s' è ambigua\n" +msgstr "%s: l'opzione \"%s\" è ambigua\n" #: lib/getopt.c:575 lib/getopt.c:579 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s: l'opzione `--%s' non accetta argomenti\n" +msgstr "%s: l'opzione \"--%s\" non accetta un argomento\n" #: lib/getopt.c:588 lib/getopt.c:593 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s: l'opzione `%c%s' non accetta argomenti\n" +msgstr "%s: l'opzione \"%c%s\" non accetta un argomento\n" #: lib/getopt.c:636 lib/getopt.c:655 lib/getopt.c:971 lib/getopt.c:990 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: l'opzione `%s' richiede un argomento\n" +msgstr "%s: l'opzione \"%s\" richiede un argomento\n" #: lib/getopt.c:693 lib/getopt.c:696 #, c-format msgid "%s: unrecognized option `--%s'\n" -msgstr "%s: opzione `--%s' non riconosciuta\n" +msgstr "%s: opzione \"--%s\" non riconosciuta\n" #: lib/getopt.c:704 lib/getopt.c:707 #, c-format msgid "%s: unrecognized option `%c%s'\n" -msgstr "%s: opzione `%c%s' non riconosciuta\n" +msgstr "%s: opzione \"%c%s\" non riconosciuta\n" #: lib/getopt.c:759 lib/getopt.c:762 #, c-format msgid "%s: illegal option -- %c\n" -msgstr "%s: opzione illecita -- %c\n" +msgstr "%s: opzione non lecita -- %c\n" #: lib/getopt.c:768 lib/getopt.c:771 #, c-format @@ -188,27 +188,29 @@ msgstr "%s: l'opzione richiede un argomento -- %c\n" #: lib/getopt.c:892 lib/getopt.c:908 #, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s: l'opzione `-W %s' è ambigua\n" +msgstr "%s: l'opzione \"-W %s\" è ambigua\n" #: lib/getopt.c:932 lib/getopt.c:950 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s: l'opzione `-W %s' non accetta argomenti\n" +msgstr "%s: l'opzione \"-W %s\" non accetta un argomento\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "memoria esaurita" -#: lib/openat-die.c:33 -#, fuzzy, c-format +#: lib/openat-die.c:35 +#, c-format msgid "unable to record current working directory" -msgstr "Impossibile cambiare la directory di lavoro" +msgstr "Impossibile registrare la directory di lavoro corrente" -#: lib/openat-die.c:46 -#, fuzzy, c-format +#: lib/openat-die.c:48 +#, c-format msgid "failed to return to initial working directory" -msgstr "Impossibile salvare la directory di lavoro" +msgstr "Impossibile ritornare alla directory di lavoro iniziale" +# (ndt) metto tra virgolette visto che è +# il nome di una funzione non traducibile #. 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. @@ -216,7 +218,7 @@ msgstr "Impossibile salvare la directory di lavoro" #: lib/paxerror.c:58 lib/paxerror.c:71 #, c-format msgid "%s: Cannot %s" -msgstr "%s: impossibile %s" +msgstr "%s: funzione \"%s\" non riuscita" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because @@ -225,12 +227,12 @@ msgstr "%s: impossibile %s" #: lib/paxerror.c:84 #, c-format msgid "%s: Warning: Cannot %s" -msgstr "%s: attenzione: impossibile %s" +msgstr "%s: attenzione: funzione \"%s\" non riuscita" #: lib/paxerror.c:93 #, c-format msgid "%s: Cannot change mode to %s" -msgstr "%s: impossibile a cambiare il modo a %s" +msgstr "%s: impossibile cambiare il modo a %s" #: lib/paxerror.c:101 #, c-format @@ -240,21 +242,21 @@ msgstr "%s: impossibile cambiare il proprietario all'UID %lu e al GID %lu" #: lib/paxerror.c:127 #, c-format msgid "%s: Cannot hard link to %s" -msgstr "%s: impossibile fare un hard link a %s" +msgstr "%s: impossibile creare un collegamento fisico a %s" #: lib/paxerror.c:179 lib/paxerror.c:211 -#, fuzzy, c-format +#, 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" +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 -#, fuzzy, c-format +#, 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" +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 #, c-format @@ -269,32 +271,32 @@ msgstr "%s: attenzione: impossibile fare seek a %s" #: lib/paxerror.c:284 #, c-format msgid "%s: Cannot create symlink to %s" -msgstr "%s: impossibile creare un link simbolico a %s" +msgstr "%s: impossibile creare un collegamento simbolico a %s" #: lib/paxerror.c:349 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" -msgstr[0] "%s: scritti solo %lu byte di %lu" -msgstr[1] "%s: scritti solo %lu byte di %lu" +msgstr[0] "%s: scritto solo %lu byte su %lu" +msgstr[1] "%s: scritti solo %lu byte su %lu" #: lib/paxnames.c:155 #, c-format msgid "Removing leading `%s' from member names" -msgstr "Rimuovo il `%s' iniziale dai nomi dei membri" +msgstr "Rimozione di \"%s\" iniziale dai nomi dei membri" #: lib/paxnames.c:156 #, c-format msgid "Removing leading `%s' from hard link targets" -msgstr "`%s' iniziale rimosso dagli obiettivi degli hard link" +msgstr "Rimozione di \"%s\" iniziale dagli obiettivi dei collegamenti fisici" #: lib/paxnames.c:169 msgid "Substituting `.' for empty member name" -msgstr "Sostituisco `.' al nome vuoto di un membro" +msgstr "Sostituzione di \".\" al nome vuoto di un membro" #: lib/paxnames.c:170 msgid "Substituting `.' for empty hard link target" -msgstr "Sostituisco `.' all'obbiettivo vuoto di un hard link" +msgstr "Sostituzione di \".\" all'obiettivo vuoto di un collegamento fisico" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -317,19 +319,31 @@ msgstr "Sostituisco `.' all'obbiettivo vuoto di un hard link" #. and use glyphs suitable for your language. #: lib/quotearg.c:266 msgid "`" -msgstr "'" +msgstr "\"" #: lib/quotearg.c:267 msgid "'" -msgstr "'" - -#: lib/rpmatch.c:69 +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=' +#: lib/rpmatch.c:147 msgid "^[yY]" -msgstr "" - -#: lib/rpmatch.c:72 +msgstr "^[sSyY]" + +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" -msgstr "" +msgstr "^[nN]" #: lib/rtapelib.c:299 #, c-format @@ -356,7 +370,7 @@ msgstr "Impossibile eseguire la shell remota" #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:65 msgid "(C)" -msgstr "" +msgstr "©" #: lib/version-etc.c:67 msgid "" @@ -367,24 +381,31 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Licenza GPLv3+: GNU GPL versione 3 o successiva \n" +"Questo programma è software libero: siete liberi di modificarlo e " +"ridistribuirlo.\n" +"Non c'è ALCUNA GARANZIA, per quanto consentito dalle vigenti normative.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:83 -#, fuzzy, c-format +#, c-format msgid "Written by %s.\n" -msgstr "Scritto da F. Pinard." +msgstr "Scritto da %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:87 -#, fuzzy, c-format +#, c-format msgid "Written by %s and %s.\n" -msgstr "Scritto da F. Pinard." +msgstr "Scritto da %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:91 -#, fuzzy, c-format +#, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "Scritto da F. Pinard." +msgstr "Scritto da %s, %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -395,6 +416,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" +"Scritto da %s, %s, %s\n" +"e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -405,6 +428,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Scritto da %s, %s, %s,\n" +"%s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -415,6 +440,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" +"Scritto da %s, %s, %s,\n" +"%s, %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -425,6 +452,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" +"Scritto da %s, %s, %s,\n" +"%s, %s, %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -436,6 +465,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" +"Scritto da %s, %s, %s,\n" +"%s, %s, %s, %s\n" +"e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -447,6 +479,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Scritto da %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -458,14 +493,17 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"Scritto da %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s e altri.\n" #: rmt/rmt.c:142 msgid "Input string too long" -msgstr "" +msgstr "Stringa di input troppo lunga" #: rmt/rmt.c:161 msgid "Number syntax error" -msgstr "" +msgstr "Errore nella sintassi del numero" #: rmt/rmt.c:180 msgid "rmtd: Cannot allocate buffer space\n" @@ -478,10 +516,10 @@ msgstr "Impossibile allocare spazio per il buffer" #: rmt/rmt.c:304 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "Usare `%s --help' per ulteriori informazioni.\n" +msgstr "Usare \"%s --help\" per ulteriori informazioni.\n" #: rmt/rmt.c:308 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION]\n" "Manipulate a tape drive, accepting commands from a remote process.\n" @@ -490,10 +528,10 @@ msgid "" " --help Output this help.\n" msgstr "" "Uso: %s [OPZIONE]\n" -"Manipola un drive per nastri accettando comandi da un processo remoto.\n" +"Manipola un'unità a nastro accettando comandi da un processo remoto.\n" "\n" -" --version Mostra le informazioni sulla versione.\n" -" --help Mostra questo aiuto.\n" +" --version Mostra le informazioni sulla versione.\n" +" --help Mostra questo aiuto.\n" #: rmt/rmt.c:315 #, c-format @@ -505,218 +543,225 @@ msgstr "" "Segnalare i bug a <%s>.\n" #: rmt/rmt.c:397 -#, fuzzy msgid "Seek offset error" -msgstr "Offset di seek fuori dai limiti" +msgstr "Errore offset di seek" #: rmt/rmt.c:406 rmt/rmt.c:547 rmt/rmt.c:557 msgid "Seek offset out of range" -msgstr "Offset di seek fuori dai limiti" +msgstr "Offset di seek fuori dell'intervallo" #: rmt/rmt.c:428 msgid "Seek direction out of range" -msgstr "Direzione di seek fuori dai limiti" +msgstr "Direzione di seek fuori dell'intervallo" #: rmt/rmt.c:472 msgid "rmtd: Premature eof\n" -msgstr "rmtd: fine del file prematura\n" +msgstr "rmtd: prematura fine del file\n" #: rmt/rmt.c:474 msgid "Premature end of file" -msgstr "Fine del file prematura" +msgstr "Prematura fine del file" #: rmt/rmt.c:672 msgid "Garbage command" msgstr "Comando spazzatura" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Questo non sembra un archivio tar" -#: src/buffer.c:333 src/buffer.c:342 -#, fuzzy +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" -msgstr "Byte totali scritti: %s (%s, %s/s)\n" +msgstr "Byte totali scritti" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" -msgstr "" +msgstr "Byte totali letti" -#: src/buffer.c:344 -#, fuzzy, c-format +#: src/buffer.c:363 +#, c-format msgid "Total bytes deleted: %s\n" -msgstr "Byte totali scritti: %s (%s, %s/s)\n" +msgstr "Byte totali eliminati: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Valore di record_size non valido" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" -msgstr "Non è stato indicato il nome di un archivio" +msgstr "Non è stato indicato il nome di un archivio" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Impossibile verificare archivi su stdin/stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" -msgstr "L'archivio è compresso. Usare l'opzione %s." +msgstr "L'archivio è compresso. Usare l'opzione %s." -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Impossibile aggiornare archivi compressi" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" -msgstr "All'inizio del nastro, abbandono adesso" +msgstr "All'inizio del nastro, uscita immediata" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" -msgstr "Troppi errori, abbandono" - -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "Blocco non allineato (%lu byte) nell'archivio" -msgstr[1] "Blocco non allineato (%lu byte) nell'archivio" +msgstr "Troppi errori, uscita" -#: src/buffer.c:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -"Impossibile muoversi all'indietro nel file dell'archivio; potrebbe essere\n" -"illeggibile senza l'opzione -i" +"Impossibile muoversi all'indietro nel file dell'archivio; potrebbe non " +"essere\n" +"leggibile senza l'opzione -i" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" -msgstr "rmtlseek non si è fermato al limite di un record" +msgstr "rmtlseek non si è fermato al limite di un record" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contiene un numero di volume non valido" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Overflow del numero di volume" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Preparare il volume #%d per %s e premere Invio: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Ricevuto EOF quando era attesa la risposta dell'utente" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" -msgstr "ATTENZIONE: l'archivio non è completo" +msgstr "Attenzione: l'archivio non è completo" -#: src/buffer.c:934 -#, fuzzy, c-format +#: src/buffer.c:954 +#, 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] Cambia il nome del file per il prossimo volume (e i successivi)\n" -" q Termina tar\n" -" ! Esegui una subshell\n" -" ? Stampa questa lista\n" +" n nome Cambia il nome del file per il prossimo volume (e i " +"successivi)\n" +" q Termina tar\n" +" y o Invio Continua l'operazione\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" -msgstr "" +msgstr " ! Esegue una subshell\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" -msgstr "" +msgstr " ? Stampa questo elenco\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" -msgstr "Nessun nuovo volume; esco.\n" +msgstr "Nessun nuovo volume; uscita.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" -msgstr "" +msgstr "Nome file non specificato. Riprovare.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" -msgstr "" +msgstr "Input non valido. Premere ? per l'aiuto.\n" -#: src/buffer.c:1044 -#, fuzzy, c-format +#: src/buffer.c:1064 +#, c-format msgid "%s command failed" -msgstr "comando `%s' fallito" +msgstr "comando \"%s\" non riuscito" -#: src/buffer.c:1199 -#, fuzzy, c-format +#: src/buffer.c:1219 +#, c-format msgid "%s is possibly continued on this volume: header contains truncated name" -msgstr "%s non continua su questo volume" +msgstr "" +"%s potrebbe continuare su questo volume: l'intestazione contiene un nome " +"troncato" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s non continua su questo volume" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" -msgstr "%s è la dimensione sbagliata (%s != %s + %s)" +msgstr "%s è la dimensione sbagliata (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" -msgstr "Questo volume è fuori sequenza" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" +msgstr "Questo volume è fuori sequenza" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "L'archivio non ha un'etichetta corrispondente a %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Il volume %s non corrisponde a %s" -#: src/buffer.c:1372 -#, fuzzy, c-format +#: src/buffer.c:1400 +#, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -"%s: il nome del file è troppo lungo per essere scritto in un'intestazione " -"GNU multivolume" +"%s: il nome del file è troppo lungo per essere scritto in un'intestazione " +"GNU multi-volume, troncato" + +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek non si è fermato al limite di un record" #: 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] "Ho potuto leggere solo %lu byte di %lu" -msgstr[1] "Ho potuto leggere solo %lu byte di %lu" +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 msgid "Contents differ" msgstr "I contenuti sono differenti" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "EOF inatteso nell'archivio" @@ -738,7 +783,7 @@ msgstr "I GID sono diversi" #: src/compare.c:212 msgid "Mod time differs" -msgstr "I tempi di modifica sono diversi" +msgstr "Gli orari di modifica sono diversi" #: src/compare.c:216 src/compare.c:420 msgid "Size differs" @@ -747,15 +792,15 @@ msgstr "Le dimensioni sono diverse" #: src/compare.c:270 #, c-format msgid "Not linked to %s" -msgstr "Non è un link a %s" +msgstr "Non è collegato a %s" #: src/compare.c:293 msgid "Symlink differs" -msgstr "Il link simbolico è diverso" +msgstr "I collegamenti simbolici sono diversi" #: src/compare.c:322 msgid "Device number differs" -msgstr "Il numero del dispositivo è diverso" +msgstr "I numeri dei device sono diversi" #: src/compare.c:462 #, c-format @@ -763,9 +808,9 @@ msgid "Verify " msgstr "Verifica " #: src/compare.c:469 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type `%c', diffed as normal file" -msgstr "%s: tipo di file '%c' sconosciuto, confrontato come un file normale" +msgstr "%s: tipo di file \"%c\" sconosciuto, confrontato come un file normale" #: src/compare.c:524 msgid "Archive contains file names with leading prefixes removed." @@ -779,8 +824,8 @@ msgstr "La verifica potrebbe non riuscire a trovare i file originali." #, 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" +msgstr[0] "Errore di verifica: trovata %d intestazione non valida" +msgstr[1] "Errore di verifica: trovate %d intestazioni non valide" #: src/compare.c:612 src/list.c:144 #, c-format @@ -788,14 +833,14 @@ msgid "A lone zero block at %s" msgstr "Un singolo blocco di zeri a %s" #: src/create.c:67 -#, fuzzy, c-format +#, c-format msgid "%s: contains a cache directory tag %s; %s" -msgstr "%s: è etichettata come cache; non archiviata" +msgstr "%s: contiene un'etichetta di directory cache %s; %s" #: src/create.c:272 #, c-format msgid "value %s out of %s range %s..%s; substituting %s" -msgstr "valore %s fuori dall'intervallo (%s) %s..%s; sostituisco %s" +msgstr "valore %s fuori dall'intervallo (%s) %s..%s; sostituzione con %s" #: src/create.c:278 #, c-format @@ -809,34 +854,34 @@ msgstr "Generazione delle intestazioni ottali negative" #: src/create.c:624 src/create.c:687 #, c-format msgid "%s: file name is too long (max %d); not dumped" -msgstr "%s: il nome del file è troppo lungo (max %d); non archiviato" +msgstr "%s: il nome del file è troppo lungo (max %d); non archiviato" #: src/create.c:634 #, c-format msgid "%s: file name is too long (cannot be split); not dumped" msgstr "" -"%s: il nome del file è troppo lungo (impossibile dividerlo); non archiviato" +"%s: il nome del file è troppo lungo (impossibile dividerlo); non archiviato" #: src/create.c:661 #, c-format msgid "%s: link name is too long; not dumped" -msgstr "%s: il nome del link è troppo lungo; non archiviato" +msgstr "%s: il nome del collegamento è troppo lungo; non archiviato" #: src/create.c:1076 #, 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: il file si è ristretto di %s byte; lo riempio con zeri" -msgstr[1] "%s: il file si è ristretto di %s byte; lo riempio con zeri" +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:1177 #, 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" -msgstr "" +msgstr "contenuti non archiviati" #: src/create.c:1361 #, c-format @@ -844,34 +889,33 @@ msgid "%s: Unknown file type; file ignored" msgstr "%s: tipo di file sconosciuto; file ignorato" #: src/create.c:1464 -#, fuzzy, c-format +#, c-format msgid "Missing links to %s.\n" -msgstr "Mancano i link a '%s'.\n" +msgstr "Collegamenti mancanti a %s.\n" #: src/create.c:1535 #, c-format msgid "%s: file is unchanged; not dumped" -msgstr "%s: non modificato; non archiviato" +msgstr "%s: il file non è modificato; non archiviato" #: src/create.c:1543 #, c-format msgid "%s: file is the archive; not dumped" -msgstr "%s: il file è l'archivio; non archiviato" +msgstr "%s: il file è l'archivio; non archiviato" #: src/create.c:1573 #, c-format msgid "%s: File removed before we read it" -msgstr "%s: il file è stato cancellato prima che potessi leggerlo" +msgstr "%s: file rimosso prima di poterlo leggere" -#: src/create.c:1591 src/incremen.c:474 -#, fuzzy +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" -msgstr "%s: è etichettata come cache; non archiviata" +msgstr "directory non archiviata" #: src/create.c:1659 #, c-format msgid "%s: file changed as we read it" -msgstr "%s: il file è cambiato mentre lo stavo leggendo" +msgstr "%s: file modificato mentre era in lettura" #: src/create.c:1739 #, c-format @@ -885,201 +929,205 @@ msgstr "%s: door ignorata" #: src/delete.c:216 src/list.c:181 src/update.c:170 msgid "Skipping to next header" -msgstr "Salto alla prossima intestazione" +msgstr "Passaggio alla prossima intestazione" #: src/delete.c:281 msgid "Deleting non-header from archive" -msgstr "Cancello una non-intestazione dall'archivio" +msgstr "Eliminazione non-intestazione dall'archivio" #: src/extract.c:198 #, c-format msgid "%s: implausibly old time stamp %s" -msgstr "%s: l'orario %s è implausibilmente vecchio" +msgstr "%s: orario %s inverosimilmente vecchio" +# (ndt) problema del plurale... #: src/extract.c:215 -#, fuzzy, c-format +#, c-format msgid "%s: time stamp %s is %s s in the future" -msgstr "%s: l'orario %s è %lu s nel futuro" +msgstr "%s: l'orario %s è %s secondi nel futuro" #: src/extract.c:395 #, c-format msgid "%s: Unexpected inconsistency when making directory" -msgstr "%s: incoerenza inaspettata durante la creazione della directory" +msgstr "%s: incoerenza inaspettata nel creare la directory" #: src/extract.c:588 #, c-format msgid "%s: Directory renamed before its status could be extracted" -msgstr "" -"%s: directory rinominata prima che fosse possibile estrarre il suo stato" +msgstr "%s: directory rinominata prima di poterne estrarre lo stato" #: src/extract.c:724 msgid "Extracting contiguous files as regular files" -msgstr "Estraggo i file contigui come file normali" +msgstr "Estrazione file contigui come file normali" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" -msgstr "Cerco di estrarre i link simbolici come hard link" +msgstr "" +"Tentativo di estrazione dei collegamenti simbolici come collegamenti fisici" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" -msgstr "Leggo %s\n" +msgstr "Lettura di %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" -msgstr "%s: impossibile estrarlo -- il file continua da un altro volume" +msgstr "%s: impossibile estrarre -- il file continua da un altro volume" -#: src/extract.c:1153 src/list.c:1081 -#, fuzzy +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" -msgstr "EOF inaspettato nei nomi mutilati" +msgstr "Intestazione di nome lungo inattesa" -#: src/extract.c:1159 -#, fuzzy, c-format +#: src/extract.c:1156 +#, c-format msgid "%s: Unknown file type `%c', extracted as normal file" -msgstr "%s: il tipo di file '%c' è sconosciuto, estratto come un file normale" +msgstr "%s: tipo di file \"%c\" sconosciuto, estratto come file normale" -#: src/extract.c:1184 -#, fuzzy, c-format +# (ndt) questo è il pezzo di codice +# if (file_newer_p (file_name, ¤t_stat_info)) +# { +# WARN ((0, 0, _("Current %s is newer or same age"), +# quote (file_name))); +# return 0; +# } +#: src/extract.c:1181 +#, c-format msgid "Current %s is newer or same age" -msgstr "Il `%s' corrente è più recente" +msgstr "Il file \"%s\" corrente è più recente o ha la stessa data" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" -msgstr "%s: non è stato possibile fare il backup di questo file" +msgstr "%s: impossibile eseguire il backup di questo file" -#: src/extract.c:1358 -#, fuzzy, c-format +#: src/extract.c:1355 +#, c-format msgid "Cannot rename %s to %s" -msgstr "%s: impossibile rinominarlo in %s" +msgstr "Impossibile rinominare %s in %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" -msgstr "Errore irrimediabile: esco subito" +msgstr "Errore irrimediabile: uscita immediata" -#: src/incremen.c:390 src/incremen.c:430 -#, fuzzy, c-format +#: src/incremen.c:445 src/incremen.c:489 +#, c-format msgid "%s: Directory has been renamed from %s" -msgstr "%s: la directory è stata rinominata" +msgstr "%s: directory rinominata da %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" -msgstr "%s: la directory è stata rinominata" +msgstr "%s: directory rinominata" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" -msgstr "%s: la directory è nuova" +msgstr "%s: la directory è nuova" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Orario non valido" -#: src/incremen.c:889 -#, fuzzy +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" -msgstr "Modo dell'opzione non valido" +msgstr "Orario di modifica non valido (secondi)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" -msgstr "" +msgstr "Orario di modifica non valido (nanosecondi)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" -msgstr "Numero di dispositivo non valido" +msgstr "Numero di device non valido" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Numero dell'inode non valido" -#: src/incremen.c:990 src/incremen.c:1027 +# (ndt) oppure rendere snapshot come istantanea? +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" -msgstr "" +msgstr "Campo troppo lungo nel leggere il file di snapshot" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" -msgstr "" +msgstr "Errore di lettura nel file di snapshot" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 -#, fuzzy +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" -msgstr "EOF inatteso nell'archivio" +msgstr "EOF inatteso nel file di snapshot" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" -msgstr "" +msgstr "Valore del campo inatteso nel file di snapshot" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" -msgstr "" +msgstr "Record finale mancante" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" -msgstr "" +msgstr "Formato file incrementale errato" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" -msgstr "" +msgstr "Versione formato incrementale non supportata: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" -msgstr "" +msgstr "dumpdir malformata: atteso \"%c\", ma trovato %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" -msgstr "" +msgstr "dumpdir malformata: \"X\" duplicata" -#: src/incremen.c:1392 -#, fuzzy +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "Argomento della densità malformato: '%s'" +msgstr "dumpdir malformata: nessun nome in \"R\"" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" -msgstr "" +msgstr "dumpdir malformata: \"T\" non preceduta da \"R\"" -#: src/incremen.c:1411 -#, fuzzy +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "Argomento della densità malformato: '%s'" +msgstr "dumpdir malformata: nessun nome in \"T\"" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" -msgstr "" +msgstr "dumpdir malformata: atteso \"%c\", ma trovata la fine dei dati" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" -msgstr "" +msgstr "dumpdir malformata: \"X\" mai usata" -#: src/incremen.c:1481 -#, fuzzy, c-format +#: src/incremen.c:1541 +#, c-format msgid "Cannot create temporary directory using template %s" -msgstr "Impossibile allocare memoria per il blocking factor %d" +msgstr "Impossibile creare la directory temporanea usando il modello %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" -msgstr "%s: non elimino la directory: impossibile fare stat" +msgstr "%s: eliminazione directory non eseguita: impossibile fare stat" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" -msgstr "%s: la directory si trova su un altro dispositivo: non eliminata" +msgstr "%s: la directory si trova su un altro device: non eliminata" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" -msgstr "%s: cancello %s\n" +msgstr "%s: eliminazione di %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: impossibile rimuoverlo" @@ -1097,98 +1145,98 @@ msgstr "blocco %s: ** Blocco di NUL **\n" #: src/list.c:155 #, c-format msgid "block %s: ** End of File **\n" -msgstr "blocco %s: ** Fine del File **\n" +msgstr "blocco %s: ** Fine del file **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blocco %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, c-format msgid "Blanks in header where numeric %s value expected" -msgstr "Trovati spazi nell'header dove era atteso il valore numerico %s" +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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" -"Il valore ottale %.*s dell'archivio è fuori dall'intervallo %s; si suppone\n" +"Il valore ottale %.*s dell'archivio è fuori dall'intervallo %s; si suppone\n" "che sia in complemento a due" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" -msgstr "Il valore ottale %.*s dell'archivio è fuori dall'intervallo %s" +msgstr "Il valore ottale %.*s dell'archivio è fuori dall'intervallo %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" -msgstr "L'archivio contiene intestazioni base-64 obsolescenti" +msgstr "L'archivio contiene intestazioni base-64 obsolete" -#: src/list.c:763 +#: src/list.c:772 #, 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" +"La stringa base-64 con segno %s dell'archivio è fuori dall'intervallo %s" -#: src/list.c:794 +#: src/list.c:803 #, c-format msgid "Archive base-256 value is out of %s range" -msgstr "Il valore base-256 dell'archvio è fuori dall'intervallo %s" +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:823 +#: src/list.c:832 #, 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:845 -#, fuzzy, c-format +#: src/list.c:854 +#, 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" +msgstr "Il valore %s dell'archivio è fuori dall'intervallo (%s) %s..%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" -msgstr " link a %s\n" +msgstr " collegamento a %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " tipo di file sconosciuto %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" -msgstr "--Link Lungo--\n" +msgstr "--Collegamento lungo--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" -msgstr "--Nome Lungo--\n" +msgstr "--Nome lungo--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" -msgstr "--Intestazione del Volume--\n" +msgstr "--Intestazione del volume--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua al byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" -msgstr "Creo la directory:" +msgstr "Creazione directory:" #: src/misc.c:456 #, c-format msgid "Renaming %s to %s\n" -msgstr "Rinomino %s in %s\n" +msgstr "Rinomina di %s in %s\n" #: src/misc.c:465 src/misc.c:483 #, c-format @@ -1198,7 +1246,7 @@ msgstr "%s: impossibile rinominarlo in %s" #: src/misc.c:488 #, c-format msgid "Renaming %s back to %s\n" -msgstr "Rinomino di nuovo %s in %s\n" +msgstr "Rinomina di %s nuovamente in %s\n" #: src/misc.c:615 msgid "Cannot save working directory" @@ -1216,26 +1264,27 @@ msgstr "il processo figlio" msgid "interprocess channel" msgstr "il canale tra processi" +# (ndt) pattern matching... trovare di meglio... #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," -msgstr "" +msgstr "Usati caratteri di corrispondenza nei nomi dei file. Usare " -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" -msgstr "" +msgstr "--wildcards per abilitare la corrispondenza o --no-wildcards " -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." -msgstr "" +msgstr "per disattivare questo avviso." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: non trovato nell'archivio" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: occorrenza richiesta non trovata nell'archivio" @@ -1243,7 +1292,7 @@ msgstr "%s: occorrenza richiesta non trovata nell'archivio" #: src/tar.c:79 #, c-format msgid "Options `-%s' and `-%s' both want standard input" -msgstr "Le opzioni `-%s' e `-%s' richiedono entrambe lo standard input" +msgstr "Le opzioni \"-%s\" e \"-%s\" richiedono entrambe lo standard input" #: src/tar.c:156 #, c-format @@ -1252,16 +1301,17 @@ msgstr "%s: formato dell'archivio non valido" #: src/tar.c:180 msgid "GNU features wanted on incompatible archive format" -msgstr "Richieste funzionalità GNU su un formato di archivio incompatibile" +msgstr "Richieste funzionalità GNU su un formato di archivio incompatibile" #: src/tar.c:241 #, 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:334 -#, fuzzy +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1271,18 +1321,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" -"\n" -"Uso: %s [OPZIONE]... [FILE]...\n" +"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" "\n" "Esempi:\n" -" %s -cf archivio.tar foo bar # Crea archivio.tar dai file foo e bar.\n" -" %s -tvf archivio.tar # Elenca prolissamente i file in archivio." +" 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" -" %s -xf archive.tar # Estrae tutti i file da archivio.tar.\n" +" tar -xf archivio.tar # Estrae tutti i file da archivio.tar.\n" -#: src/tar.c:343 -#, fuzzy +#: src/tar.c:345 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 " @@ -1293,1884 +1342,1361 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"GNU `tar' salva molti file in un solo archivio su nastro o disco e può\n" -"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 archive.tar # Elenca prolissamente i file in archivio." -"tar.\n" -" tar -xf archive.tar # Estrae tutti i file da archivio.tar.\n" -"Il suffisso dei backup è `~', a meno che sia impostato con --suffix oppure\n" +"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\n" -"VERSION_CONTROL, i valori possibili sono:\n" +"Il controllo di versione può essere impostato con --backup oppure " +"VERSION_CONTROL,\n" +"i valori possibili sono:\n" "\n" -" t, numbered fa backup numerati\n" -" nil, existing numerati se esistono backup numerati, altrimenti semplici\n" -" never, simple fa sempre backup semplici\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:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Modi operativi principali:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" -msgstr "elenca i contenuti dell'archivio" +msgstr "Elenca i contenuti dell'archivio" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" -msgstr "estrae file da un archivio" +msgstr "Estrae file da un archivio" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" -msgstr "crea un nuovo archivio" +msgstr "Crea un nuovo archivio" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" -msgstr "cerca differenze tra l'archivio e il file system" +msgstr "Trova differenze tra l'archivio e il file system" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" -msgstr "accoda i file alla fine di un archivio" +msgstr "Accoda i file alla fine di un archivio" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" -msgstr "accoda solo i file più recenti della copia nell'archivio" +msgstr "Accoda solo i file più recenti della copia nell'archivio" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" -msgstr "aggiunge il contenuto di un altro archivio" +msgstr "Aggiunge il contenuto di un altro archivio" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" -msgstr "cancella dall'archivio (non su nastri magnetici!)" +msgstr "Elimina dall'archivio (non su nastri magnetici)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" -msgstr "" +msgstr "Verifica l'etichetta di volume dell'archivio ed esce" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Modificatori delle operazioni:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" -msgstr "gestisce efficientemente i file sparsi" +msgstr "Gestisce efficientemente i file sparsi" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" -msgstr "" +msgstr "MAJOR[.MINOR]" -#: src/tar.c:401 +# (ndt) hmmm... formato sparso... +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" -msgstr "" +msgstr "Imposta la versione da usare per il formato sparso (implica --sparse)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "gestisce i vecchi backup incrementali GNU" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FILE" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" -msgstr "gestisce i nuovi backup incrementali GNU" +msgstr "Gestisce il nuovo formato di backup incrementali GNU" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" -msgstr "non usce con non-zero quando ci sono file illeggibili" +msgstr "Non esce con non-zero quando ci sono file non leggibili" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMERO" -#: src/tar.c:409 -#, fuzzy +#: src/tar.c:411 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 "" -"processa solo la N-esima occorrenza di ogni file nell'archivio. Questa " -"opzione è valida solo se usata insieme con uno dei sottocomandi --delete, --" -"diff, --extract o --list, e quando una lista di file è fornita da linea di " -"comando o attraverso l'opzione -T. NUMERO è predefinito a 1." +"Elabora solo la NUMERO-esima occorrenza di ogni file nell'archivio; " +"quest'opzione è valida solo se usata insieme a uno dei sottocomandi --" +"delete, --diff, --extract o --list e quando viene fornito un elenco di file " +"sulla riga di comando o attraverso l'opzione -T; il valore predefinito di " +"NUMERO è 1" -#: src/tar.c:415 -#, fuzzy +#: src/tar.c:417 msgid "archive is seekable" -msgstr "È possibile posizionarsi nell'archivio" +msgstr "L'archivio è posizionabile" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "Non controlla i numeri del device quando crea archivi incrementali" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" +"Controlla i numeri del device quando crea archivi incrementali (predefinito)" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" -msgstr "" +msgstr "Controlli di sovrascrittura:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" -msgstr "prova a verificare l'archivio dopo averlo scritto" +msgstr "Tenta di verificare l'archivio dopo averlo scritto" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" -msgstr "cancella i file dopo averli aggiunti all'archivio" +msgstr "Rimuove i file dopo averli aggiunti all'archivio" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" -msgstr "durante l'estrazione non sovrascrive i file esistenti" +msgstr "Durante l'estrazione non sovrascrive i file esistenti" -#: src/tar.c:435 +#: src/tar.c:437 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" +msgstr "Non sostituisce i file esistenti più recenti delle copie nell'archivio" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" -msgstr "sovrascrive i file esistenti durante l'estrazione" +msgstr "Sovrascrive i file esistenti durante l'estrazione" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" -msgstr "cancella ogni file prima di estrarre su di esso" +msgstr "Rimuove ogni file prima di estrarre su di esso" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" -msgstr "svuota le directory prima di estrarle" +msgstr "Svuota le directory prima di estrarle" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" -msgstr "preserva i metadati delle directory esistenti" +msgstr "Preserva i metadati delle directory esistenti" -#: src/tar.c:445 -#, fuzzy +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" -msgstr "sovrascrive i file esistenti durante l'estrazione" +msgstr "" +"Sovrascrive i metadati delle directory esistenti durante l'estrazione " +"(predefinito)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" -msgstr "" +msgstr "Selezione stream di output:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" -msgstr "estrae i file su standard output" +msgstr "Estrae i file sullo standard output" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMANDO" -#: src/tar.c:456 -#, fuzzy +#: src/tar.c:458 msgid "pipe extracted files to another program" -msgstr "estrae i file su standard output" +msgstr "Invia in pipe i file estratti a un altro programma" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" -msgstr "" +msgstr "Ignora il codice di uscita dei figli" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" -msgstr "" +msgstr "Considera i codici di uscita non-zero come un errore" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Gestione degli attributi dei file:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" -msgstr "forza il proprietario NOME per i file aggiunti" +msgstr "Forza NOME come proprietario per i file aggiunti" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" -msgstr "forza il gruppo NOME per i file aggiunti" +msgstr "Forza NOME come gruppo per i file aggiunti" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATA-O-FILE" -#: src/tar.c:472 -#, fuzzy +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" -msgstr "archivia solo i file più recenti di DATA-O-FILE" +msgstr "Imposta mtime per i file aggiunti da DATA-O-FILE" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "CAMBI" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" -msgstr "forza il modo (simbolico) CAMBI per i file aggiunti" +msgstr "Forza il modo CAMBI (simbolico) per i file aggiunti" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" -msgstr "" +msgstr "METODO" -#: src/tar.c:477 +#: src/tar.c:479 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 "" +"Preserva l'orario di accesso sui file archiviati, ripristinando l'orario " +"dopo la lettura (METODO=\"replace\"; predefinito) o impostando l'orario " +"all'inizio (METODO=\"system\")" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" -msgstr "non estrae l'orario di ultima modifica del file" +msgstr "Non estrae l'orario di ultima modifica del file" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" -msgstr "cerca di estrarre i file mantenendo lo stesso proprietario" +msgstr "Cerca di estrarre i file con lo stesso proprietario" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" -msgstr "estrae i file come te stesso" +msgstr "Estrae i file come l'utente attuale" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" -msgstr "usa sempre i numeri per i nomi di utente/gruppo" +msgstr "Usa sempre i numeri per i nomi di utente/gruppo" -#: src/tar.c:489 +#: src/tar.c:491 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:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" +"Applica la umask dell'utente nell'estrarre i permessi dall'archivio " +"(predefinito per gli utenti normali)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" -msgstr "ordina i nomi da estrarre come nell'archivio" +msgstr "Ordina i nomi da estrarre come nell'archivio" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" -msgstr "come -p e -s insieme" +msgstr "Come -p e -s assieme" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" +"Ritarda l'impostazione dei tempi di modifica e dei permessi delle directory " +"estratte al termine dell'estrazione" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" -msgstr "" +msgstr "Annulla l'effetto dell'opzione --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" -msgstr "Selezione e cambio del dispositivo:" +msgstr "Selezione e cambio del device:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHIVIO" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" -msgstr "usa come archivio il file o il dispositivo ARCHIVIO" +msgstr "Usa come archivio il file o il dispositivo ARCHIVIO" -#: src/tar.c:513 -#, fuzzy +#: src/tar.c:515 msgid "archive file is local even if it has a colon" -msgstr "il file dell'archivio è locale anche se contiene `:'" +msgstr "L'archivio è locale anche se contiene \":\"" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" -msgstr "usa il COMANDO rmt indicato invece di rmt" +msgstr "Usa il COMANDO rmt indicato invece di rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" -msgstr "usa il COMANDO remoto invece di rsh" +msgstr "Usa il COMANDO remoto invece di rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" -msgstr "indica drive e densità" +msgstr "Indica drive e densità" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" -msgstr "crea/elenca/estrae archivi multi-volume" +msgstr "Crea, elenca, estrae archivi multi-volume" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" -msgstr "cambia il nastro dopo avere scritto NUMERO x 1024 byte" +msgstr "Cambia il nastro dopo avere scritto NUMERO × 1024 byte" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" -msgstr "esegue lo script alla fine di ogni nastro (implica -M)" +msgstr "Esegue lo script alla fine di ogni nastro (implica -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" -msgstr "usa/aggiorna il numero del volume nel FILE" +msgstr "Usa/aggiorna il numero del volume nel FILE" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" -msgstr "Blocking dei dispositivi:" +msgstr "Blocchi dei dispositivi:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOCCHI" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" -msgstr "usa record di BLOCCHI x 512 byte" +msgstr "Usa record di BLOCCHI × 512 byte" -# Purtroppo non è possibile tradurre SIZE nell'opzione, quindi non posso -# tradurlo nemmeno in questa descrizione. -#: src/tar.c:552 -#, fuzzy +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" -msgstr "usa SIZE byte per record, multiplo di 512" +msgstr "NUMERO di byte per record, multiplo di 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" -msgstr "ignora i blocchi a zero nell'archivio (significa EOF)" +msgstr "Ignora i blocchi a zero nell'archivio (significa EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" -msgstr "rifà i blocchi in lettura (per le pipe di 4.2BSD)" +msgstr "Rifà i blocchi durante la lettura (per le pipe di 4.2BSD)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" -msgstr "Selezione del formato di archiviazione:" +msgstr "Selezione formato di archiviazione:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMATO" -#: src/tar.c:564 -#, fuzzy +#: src/tar.c:566 msgid "create archive of the given format" -msgstr "crea gli archivi nel formato indicato." +msgstr "Crea archivi nel formato indicato" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" -msgstr "Il FORMATO è uno dei seguenti:" +msgstr "FORMATO è uno dei seguenti:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" -msgstr "vecchio formato di tar V7" +msgstr "Vecchio formato di tar V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" -msgstr "formato GNU di tar <= 1.12" +msgstr "Formato GNU di tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" -msgstr "formato GNU di tar 1.13.x" +msgstr "Formato GNU di tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Formato POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Formato POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 -#, fuzzy +#: src/tar.c:579 msgid "same as pax" msgstr "Come pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" -msgstr "come --format=v7" +msgstr "Come --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" -msgstr "come --format=posix" +msgstr "Come --format=posix" -#: src/tar.c:584 -#, fuzzy +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." -msgstr "parolachiave[[:]=valore][,parolachiave[[:]=calore], ...]" +msgstr "PAROLA_CHIAVE[[:]=VALORE][,PAROLA_CHIAVE[[:]=VALORE], ...]" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" -msgstr "controlla le parole chiavi di pax" +msgstr "Controlla le parole chiavi di pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TESTO" -#: src/tar.c:587 -#, fuzzy +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -"crea l'archivio con il NOME di volume. Al momento dell'elencazione o " -"dell'estrazione, usa il TESTO come modello di globbing" +"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:592 -#, fuzzy +#: src/tar.c:594 msgid "Compression options:" -msgstr "Conflitto tra le opzioni di compressione" +msgstr "Opzioni di compressione:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" +"Usa il suffisso dell'archivio per determinare il programma di compressione" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "" +"Usa il suffisso dell'archivio per determinare il programma di compressione" + +#: src/tar.c:601 msgid "filter the archive through bzip2" -msgstr "filtra l'archivio attraverso bzip2" +msgstr "Filtra l'archivio attraverso bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" -msgstr "filtra l'archivio attraverso gzip" +msgstr "Filtra l'archivio attraverso gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" -msgstr "filtra l'archivio attraverso compress" +msgstr "Filtra l'archivio attraverso compress" -#: src/tar.c:605 -#, fuzzy +#: src/tar.c:610 msgid "filter the archive through lzma" -msgstr "filtra l'archivio attraverso gzip" +msgstr "Filtra l'archivio attraverso lzma" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "Filtra l'archivio attraverso gzip" + +#: src/tar.c:613 msgid "PROG" -msgstr "PROGRAMMA" +msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" -msgstr "filtra usando PROGRAMMA (deve accettare -d)" +msgstr "Filtra attraverso PROG (deve accettare -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Selezione dei file locali:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" -msgstr "" +msgstr "Aggiunge FILE all'archivio (utile se il nome inizia con un trattino)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "DIR" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" -msgstr "entra nella directory DIR" +msgstr "Passa alla directory DIR" -#: src/tar.c:619 -#, fuzzy +#: src/tar.c:626 msgid "get names to extract or create from FILE" -msgstr "prende i nomi da estrarre o creare dal file NOME" +msgstr "Prende i nomi da estrarre o creare dal file FILE" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T legge nomi terminati da NULL, disabilita -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" +"Toglie i caratteri di citazione dai nomi dei file letti con -T (predefinito)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" -msgstr "" +msgstr "Non toglie i caratteri di citazione dai nomi dei file letti con -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "MODELLO" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" -msgstr "escludi i file i cui nomi corrispondono al MODELLO" +msgstr "Esclude i file i cui nomi corrispondono a MODELLO" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" -msgstr "escludi i modelli elencati in FILE" +msgstr "Esclude i modelli elencati in FILE" -#: src/tar.c:631 -#, fuzzy +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" -msgstr "esclude le directory etichettate come cache" +msgstr "" +"Esclude i contenuti delle directory contenenti CACHEDIR.TAG, a parte il " +"file .TAG stesso" -#: src/tar.c:634 -#, fuzzy +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "esclude le directory etichettate come cache" +msgstr "Esclude tutto quanto all'interno di directory contenenti CACHEDIR.TAG" -#: src/tar.c:637 -#, fuzzy +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" -msgstr "esclude le directory etichettate come cache" +msgstr "Esclude le directory contenenti CACHEDIR.TAG" -#: src/tar.c:639 -#, fuzzy +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" -msgstr "esclude le directory etichettate come cache" +msgstr "" +"Esclude i contenuti delle directory contenenti FILE, a parte FILE stesso " -#: src/tar.c:642 -#, fuzzy +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" -msgstr "esclude le directory etichettate come cache" +msgstr "Esclude tutto quanto all'interno di directory contenenti FILE" -#: src/tar.c:644 -#, fuzzy +#: src/tar.c:653 msgid "exclude directories containing FILE" -msgstr "esclude le directory etichettate come cache" +msgstr "Esclude le directory contenenti FILE" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" -msgstr "" +msgstr "Esclude le directory dei sistemi di controllo della versione" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" -msgstr "non entra automaticamente nelle directory" +msgstr "Non entra automaticamente nelle directory" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" -msgstr "resta nel file system locale durante la creazione dell'archivio" +msgstr "Resta nel file system locale durante la creazione dell'archivio" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" -msgstr "entra ricorsivamente nelle directory (predefinito)" +msgstr "Entra ricorsivamente nelle directory (predefinito)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" -msgstr "non rimuove lo `/' iniziale dai nomi dei file" +msgstr "Non rimuove le \"/\" iniziali dai nomi dei file" -#: src/tar.c:656 +# (ndt) hmmm... non molto chiara... +#: src/tar.c:665 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:658 +#: src/tar.c:667 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "NOME" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" -msgstr "comincia dal membro NOME nell'archivio" +msgstr "Inizia dal membro NOME nell'archivio" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" -msgstr "archivia solo i file più recenti di DATA-O-FILE" +msgstr "Archivia solo i file più recenti di DATA-O-FILE" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATA" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" -msgstr "confronta data e ora solo quando il contenuto è cambiato" +msgstr "Confronta data e ora solo quando il contenuto è cambiato" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "CONTROLLO" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" -msgstr "fa un backup prima di rimuovere, scegliendo il CONTROLLO di versione" +msgstr "Esegue un backup prima di rimuovere, usando il CONTROLLO di versione" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "STRINGA" -#: src/tar.c:669 -#, fuzzy +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -"fa un backup prima di rimuovere, cambiando il solito suffisso '~' a meno che " -"sia cambiato tramite la variabile di ambiente SIMPLE_BACKUP_SUFFIX" +"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:674 +#: src/tar.c:683 msgid "File name transformations:" -msgstr "" +msgstr "Trasformazioni dei nomi di file:" -#: src/tar.c:676 -#, fuzzy +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" -msgstr "toglie NUMERO componenti iniziali dai nomi dei file" +msgstr "" +"Toglie NUMERO componenti iniziali dai nomi dei file durante l'estrazione" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" -msgstr "" +msgstr "ESPRESSIONE" -#: src/tar.c:679 +#: src/tar.c:688 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:684 +#: src/tar.c:694 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:687 -#, fuzzy +#: src/tar.c:697 msgid "ignore case" -msgstr "le esclusioni ignorano maiuscole/minuscole" +msgstr "Non fa differenza tra maiuscole e minuscole" -#: src/tar.c:689 -#, fuzzy +#: src/tar.c:699 msgid "patterns match file name start" -msgstr "i modelli di esclusione corrispondono all'inizio del nome del file" +msgstr "I modelli corrispondono all'inizio del nome del file" -#: src/tar.c:691 -#, fuzzy +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" -msgstr "i modelli di esclusione vengono confrontati dopo ogni / (predefinito)" +msgstr "" +"I modelli corrispondono dopo ogni \"/\" (predefinito per le esclusioni)" -#: src/tar.c:693 -#, fuzzy +#: src/tar.c:703 msgid "case sensitive matching (default)" -msgstr "le esclusioni considerano maiuscole/minuscole (predefinito)" +msgstr "Considera diverse le maiuscole e le minuscole (predefinito)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" -msgstr "" +msgstr "Utilizza i metacaratteri (predefinito per le esclusioni)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" -msgstr "" +msgstr "Corrispondenza letterale della stringa" -#: src/tar.c:699 -#, fuzzy +#: src/tar.c:709 msgid "wildcards do not match `/'" -msgstr "" -"i metacaratteri dei modelli di esclusione non possono corrispondere a `/'" +msgstr "I metacaratteri non corrispondono \"/\"" -#: src/tar.c:701 -#, fuzzy +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" -msgstr "" -"i metacaratteri dei modelli di esclusione possono corrispondere a " -"`/' (predefinito)" +msgstr "I metacaratteri corrispondono \"/\" (predefinito per le esclusioni)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Output informativo:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" -msgstr "elenca prolissamente i file processati" +msgstr "Elenca prolissamente i file elaborati" -#: src/tar.c:711 -#, fuzzy +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" -msgstr "mostra i progressi ogni 10 record" +msgstr "" +"Visualizza un messaggio di avanzamento ogni NUMERO-esimo record (predefinito " +"10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" -msgstr "" +msgstr "AZIONE" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" -msgstr "" +msgstr "Esegue l'azione a ogni punto di controllo" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" -msgstr "stampa un messaggio se non tutti i link sono archiviati" +msgstr "Stampa un messaggio se non tutti i collegamenti sono archiviati" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" -msgstr "" +msgstr "SEGNALE" -#: src/tar.c:719 +#: src/tar.c:729 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 "" +"Stampa i byte totali dopo l'elaborazione dell'archivio; con un argomento - " +"stampa i byte totali quando viene inviato il SEGNALE. I segnali consentiti " +"sono: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 e SIGUSR2; sono accettati anche i " +"nomi senza il prefisso SIG" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" -msgstr "stampa le date di modifica dei file in formato UTC" +msgstr "Stampa le date di modifica dei file in formato UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" -msgstr "manda l'output verboso al FILE" +msgstr "Invia l'output prolisso al FILE" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" -msgstr "mostra il numero di blocco nell'archivio ad ogni messaggio" +msgstr "Mostra il numero di blocco nell'archivio con ogni messaggio" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" -msgstr "chiede conferma per ogni azione" +msgstr "Chiede conferma per ogni azione" -#: src/tar.c:733 -#, fuzzy +#: src/tar.c:743 msgid "show tar defaults" -msgstr "Mostra le opzioni predefinite di tar" +msgstr "Mostra le impostazioni predefinite di tar" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" "All'elencazione o all'estrazione, elenca ogni directory che non corrisponde " -"ai criteri di ricerca." +"al criterio di ricerca" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" -msgstr "" +msgstr "Mostra il nome del file o dell'archivio dopo la trasformazione" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" -msgstr "" +msgstr "STILE" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" -msgstr "" +msgstr "Caratteri di citazione aggiuntivi da STRINGA" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" -msgstr "" +msgstr "Disabilita la citazione per i caratteri dalla STRINGA" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" -msgstr "Opzioni di compabilità:" +msgstr "Opzioni di compatibilità:" -#: src/tar.c:753 -#, fuzzy +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -"alla creazione, uguale a --old-archive. All'estrazione, uguale a --no-same-" +"Alla creazione, uguale a --old-archive; all'estrazione, uguale a --no-same-" "owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Altre opzioni:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" -msgstr "" +msgstr "Disabilita l'uso di alcune opzioni potenzialmente dannose" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" -msgstr "Impossibile indicare più di una delle opzioni `-Acdtrux'" +msgstr "Non è possibile indicare più di un'opzione \"-Acdtrux\"" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Conflitto tra le opzioni di compressione" -#: src/tar.c:965 -#, fuzzy, c-format +#: src/tar.c:985 +#, c-format msgid "Unknown signal name: %s" -msgstr " tipo di file sconosciuto %s\n" +msgstr "Nome del segnale sconosciuto: %s" -#: src/tar.c:989 -#, fuzzy +#: src/tar.c:1009 msgid "Date sample file not found" -msgstr "File della data non trovato" +msgstr "File campione della data non trovato" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" -msgstr "Sostituisco %s al posto del formato di data sconosciuto %s" +msgstr "Sostituzione di %s al posto del formato di data sconosciuto %s" -#: src/tar.c:1022 -#, fuzzy, c-format +#: src/tar.c:1042 +#, c-format msgid "Option %s: Treating date `%s' as %s" -msgstr "Tratto la data `%s' come %s + %ld nanosecondo" +msgstr "Opzione %s: la data \"%s\" viene considerata come %s" -#: src/tar.c:1096 -#, fuzzy, c-format +#: src/tar.c:1119 +#, c-format msgid "%s: file list already read" -msgstr "%s: il file è l'archivio; non archiviato" +msgstr "%s: elenco file già letto" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" -msgstr "" +msgstr "%s: il nome di file letto contiene un carattere NULL" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" -msgstr "" +msgstr "Argomenti validi per le opzioni --quoting-style sono:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" "\n" -"*Questo* tar ha le seguenti opzioni predefinite:\n" +"Questo tar ha le seguenti impostazioni predefinite:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" -msgstr "Blocking factor non valido" +msgstr "Fattore del blocco non valido" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" -msgstr "Attenzione: l'opzione -I non è gestita; forse intendevi -j o -T?" +msgstr "" +"Attenzione: l'opzione -I non è supportata; forse si intendeva usare -j o -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Lunghezza del nastro non valida" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" -msgstr "Più di una data di soglia" +msgstr "Più di una data di soglia" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" -msgstr "" +msgstr "Valore versione sparsa non valido" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" -msgstr "" +msgstr "--atime-preserve=\"system\" non è supportato su questa piattaforma" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" -msgstr "" +msgstr "Il valore --checkpoint non è un intero" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: gruppo non valido" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" -msgstr "Modo dell'opzione non valido" +msgstr "Modo fornito sull'opzione non valido" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Numero non valido" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Proprietario non valido" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Dimensione del record non valida" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Numero di elementi non valido" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" -msgstr "" +msgstr "Consentita solo un'opzione --to-command" -#: src/tar.c:1930 -#, fuzzy, c-format +#: src/tar.c:1969 +#, c-format msgid "Malformed density argument: %s" -msgstr "Argomento della densità malformato: '%s'" +msgstr "Argomento densità non corretto: \"%s\"" -#: src/tar.c:1956 -#, fuzzy, c-format +#: src/tar.c:1995 +#, c-format msgid "Unknown density: `%c'" -msgstr "Densità sconosciuta: '%c'" +msgstr "Densità sconosciuta: \"%c\"" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" -msgstr "Le opzioni `-[0-7][lmh]' non sono gestite da *questo* tar" +msgstr "Le opzioni \"-[0-7][lmh]\" non sono gestite da questo tar" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FILE]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." -msgstr "La vecchia opzione `%c' richiede un argomento." +msgstr "La vecchia opzione \"%c\" richiede un argomento." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" -msgstr "--occurrence non ha senso senza una lista di file" +msgstr "--occurrence non ha senso senza un elenco di file" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" -msgstr "--occurrence non può essere usata nel modo di operazioni richiesto" +msgstr "--occurrence non può essere usata nel modo di operazioni richiesto" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" -msgstr "Archivi multipli richiedono l'opzione `-M'" +msgstr "Archivi multipli richiedono l'opzione \"-M\"" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Impossibile combinare --listed-incremental e --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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 è %lu byte)" +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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" -msgstr "Impossibile verificare archivi multivolume" +msgstr "Impossibile verificare archivi multi-volume" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Impossibile verificare archivi compressi" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" -msgstr "Impossibile usare archivi multivolume compressi" +msgstr "Impossibile usare archivi multi-volume compressi" -#: src/tar.c:2281 -#, fuzzy +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" -msgstr "Impossibile aggiornare archivi compressi" +msgstr "Impossibile concatenare archivi compressi" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" -msgstr "--pax-option può essere usata solo su archivi POSIX" +msgstr "--pax-option può essere usata solo su archivi POSIX" + +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" -msgstr "Codardamente mi rifiuto di creare un archivio vuoto" +msgstr "Rifiuto totale di creare un archivio vuoto" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" -msgstr "Le opzioni `-Aru' sono incompatibili con `-f -'" +msgstr "Le opzioni \"-Aru\" sono incompatibili con \"-f -\"" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" -msgstr "Bisogna indicare una delle opzioni `-Acdtrux'" +msgstr "È necessario specificare una delle opzioni \"-Acdtrux\"" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Uscita per errore ritardata dall'errore precedente" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" -msgstr[0] "%s: il file si è rimpicciolito di %s byte" -msgstr[1] "%s: il file si è rimpicciolito di %s byte" +msgstr[0] "%s: il file si è ridotto di %s byte" +msgstr[1] "%s: il file si è ridotto di %s byte" -#: src/xheader.c:158 -#, fuzzy, c-format +#: src/xheader.c:156 +#, c-format msgid "Keyword %s is unknown or not yet implemented" -msgstr "La parola chiave %s è sconosciuta o non ancora implementata" +msgstr "La parola chiave %s è sconosciuta o non ancora implementata" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" -msgstr "Il modello %s non può essere usato" +msgstr "Il modello %s non può essere usato" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" -msgstr "La parola chiave %s non può essere sostituita" +msgstr "La parola chiave %s non può essere sostituita" -#: src/xheader.c:498 -#, fuzzy +#: src/xheader.c:496 msgid "Malformed extended header: missing length" -msgstr "Intestazione estesa malformata: manca il segno di uguale" +msgstr "Intestazione estesa malformata: manca la lunghezza" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" -msgstr "" +msgstr "La lunghezza intestazione estesa è fuori dall'intervallo consentito" -#: src/xheader.c:513 -#, fuzzy, c-format +#: src/xheader.c:511 +#, c-format msgid "Extended header length %*s is out of range" -msgstr "" -"La stringa base-64 con segno %s dell'archivio è fuori dall'intervallo %s" +msgstr "La lunghezza dell'intestazione estesa %*s è fuori dall'intervallo" -#: src/xheader.c:525 -#, fuzzy +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Intestazione estesa malformata: manca lo spazio dopo la lunghezza" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Intestazione estesa malformata: manca il segno di uguale" -#: src/xheader.c:539 -#, fuzzy +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" -msgstr "Intestazione estesa malformata: manca il segno di uguale" +msgstr "Intestazione estesa malformata: manca un newline" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" -msgstr "" +msgstr "Parola chiave sconosciuta \"%s\" dell'intestazione estesa ignorata" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" +"La coppia parola chiave/valore generata è troppo lunga (parola chiave=%s, " +"lunghezza=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 -#, fuzzy, c-format +#: src/xheader.c:810 +#, c-format msgid "Extended header %s=%s is out of range %s..%s" -msgstr "Il valore %s dell'archivio è fuori dall'intervallo %s %s.%s" +msgstr "L'intestazione estesa %s=%s è fuori dall'intervallo %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 -#, fuzzy, c-format +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 +#, c-format msgid "Malformed extended header: invalid %s=%s" -msgstr "Intestazione estesa malformata: manca il segno di uguale" +msgstr "Intestazione estesa malformata: %s=%s non valido" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 -#, fuzzy, c-format +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 +#, c-format msgid "Malformed extended header: excess %s=%s" -msgstr "Intestazione estesa malformata: manca il segno di uguale" +msgstr "Intestazione estesa malformata: %s=%s in eccesso" -#: src/xheader.c:1328 -#, fuzzy, c-format +#: src/xheader.c:1326 +#, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "Intestazione estesa malformata: manca il segno di uguale" +msgstr "" +"Intestazione estesa malformata: %s non valido: delimitatore %c non atteso" -#: src/xheader.c:1338 -#, fuzzy, c-format +#: src/xheader.c:1336 +#, c-format msgid "Malformed extended header: invalid %s: odd number of values" -msgstr "Intestazione estesa malformata: manca il segno di uguale" +msgstr "" +"Intestazione estesa malformata: %s non valido: numero dispari di valori" #: src/checkpoint.c:107 -#, fuzzy, c-format +#, c-format msgid "%s: not a valid timeout" -msgstr "%s: gruppo non valido" +msgstr "%s: timeout non valido" #: src/checkpoint.c:112 #, c-format msgid "%s: unknown checkpoint action" -msgstr "" +msgstr "%s: azione di punto di controllo sconosciuta" #: src/checkpoint.c:132 msgid "write" -msgstr "" +msgstr "lettura" #: src/checkpoint.c:132 msgid "read" -msgstr "" +msgstr "scrittura" #. 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:222 -#, fuzzy, c-format +#, c-format msgid "Write checkpoint %u" -msgstr "Checkpoint di scrittura %d" +msgstr "Punto di controllo di scrittura %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:228 -#, fuzzy, c-format +#, c-format msgid "Read checkpoint %u" -msgstr "Checkpoint di lettura %d" +msgstr "Punto di controllo di lettura %u" #: tests/genfile.c:111 -#, fuzzy msgid "" "genfile manipulates data files for GNU paxutils test suite.\n" "OPTIONS are:\n" -msgstr "Genero i file di dati per la suite di test di GNU tar.\n" +msgstr "" +"genfile manipola i file per la suite GNU paxutils.\n" +"Le opzioni sono:\n" #: tests/genfile.c:126 -#, fuzzy msgid "File creation options:" -msgstr "Altre opzioni:" +msgstr "Opzioni di creazione file:" #: tests/genfile.c:127 tests/genfile.c:138 msgid "SIZE" -msgstr "" +msgstr "DIMENSIONE" #: tests/genfile.c:128 -#, fuzzy msgid "Create file of the given SIZE" -msgstr "crea gli archivi nel formato indicato." +msgstr "Crea file della DIMENSIONE indicata" #: tests/genfile.c:130 -#, fuzzy msgid "Write to file NAME, instead of standard output" -msgstr "estrae i file su standard output" +msgstr "Scrive sul file NOME invece dello standard output" #: tests/genfile.c:132 -#, fuzzy msgid "Read file names from FILE" -msgstr "Letti %s byte da %s" +msgstr "Legge i nomi dei file da FILE" #: tests/genfile.c:134 -#, fuzzy msgid "-T reads null-terminated names" -msgstr "-T legge nomi terminati da NULL, disabilita -C" +msgstr "-T legge nomi terminati da NULL" #: tests/genfile.c:136 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" msgstr "" +"Riempie il file con il MODELLO fornito. MODELLO è \"default\" o \"zeroes\"" #: tests/genfile.c:139 msgid "Size of a block for sparse file" -msgstr "" +msgstr "Dimensione del blocco per il file sparso" #: tests/genfile.c:141 msgid "Generate sparse file. Rest of the command line gives the file map." msgstr "" +"Genera file sparso. Il resto della riga di comando fornisce la mappa del " +"file." #: tests/genfile.c:143 msgid "OFFSET" -msgstr "" +msgstr "OFFSET" #: tests/genfile.c:144 -#, fuzzy msgid "Seek to the given offset before writing data" -msgstr "prova a verificare l'archivio dopo averlo scritto" +msgstr "Si posiziona all'OFFSET indicato prima di scrivere i dati" #: tests/genfile.c:150 msgid "File statistics options:" -msgstr "" +msgstr "Opzioni per le statistiche:" #: tests/genfile.c:153 msgid "Print contents of struct stat for each given file. Default FORMAT is: " msgstr "" +"Stampa i contenuti di struct stat per ogni file dato. Il FORMATO predefinito " +"è:" #: tests/genfile.c:160 msgid "Synchronous execution options:" -msgstr "" +msgstr "Opzioni di esecuzione sincrona:" #: tests/genfile.c:163 msgid "" "Execute given COMMAND. Useful with --checkpoint and one of --cut, --append, " "--touch" msgstr "" +"Esegue il COMANDO dato. Utile con --checkpoint e uno tra --cut, --append, --" +"touch" #: tests/genfile.c:166 msgid "Perform given action (see below) upon reaching checkpoint NUMBER" msgstr "" +"Esegue l'azione indicata (consultare più sotto) al raggiungimento del punto " +"di controllo NUMERO" #: tests/genfile.c:169 msgid "Set date for next --touch option" -msgstr "" +msgstr "Imposta la data per l'opzione --touch successiva" #: tests/genfile.c:172 msgid "Display executed checkpoints and exit status of COMMAND" msgstr "" +"Visualizza i punti di controllo eseguiti e lo stato di uscita del COMANDO" #: tests/genfile.c:177 msgid "" "Synchronous execution actions. These are executed when checkpoint number " "given by --checkpoint option is reached." msgstr "" +"Azioni di esecuzione sincrona. Queste sono eseguite quando viene raggiunto " +"il punto di controllo fornito dall'opzione --checkpoint." #: tests/genfile.c:180 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" msgstr "" +"Tronca il FILE alla dimensione specificata dall'opzione --length precedente " +"(0 se non viene fornita)" #: tests/genfile.c:184 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." msgstr "" +"Aggiunge DIMENSIONE byte al FILE. DIMENSIONE è fornita dall'opzione --length " +"precedente." #: tests/genfile.c:187 msgid "Update the access and modification times of FILE" -msgstr "" +msgstr "Aggiorna l'orario di accesso e modifica del FILE" #: tests/genfile.c:190 -#, fuzzy msgid "Execute COMMAND" -msgstr "COMANDO" +msgstr "Esegue il COMANDO" #: tests/genfile.c:240 -#, fuzzy, c-format +#, c-format msgid "Invalid size: %s" -msgstr "Orario non valido" +msgstr "Dimensione non valida: %s" #: tests/genfile.c:245 -#, fuzzy, c-format +#, c-format msgid "Number out of allowed range: %s" -msgstr "Numero dell'inode fuori dai limiti" +msgstr "Numero fuori dall'intervallo consentito: %s" #: tests/genfile.c:248 #, c-format msgid "Negative size: %s" -msgstr "" +msgstr "Dimensione negativa: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" +msgstr "stat(%s) non riuscita" + +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:268 #, c-format -msgid "Error parsing number near `%s'" +msgid "created file is not sparse" msgstr "" -#: tests/genfile.c:361 -#, fuzzy, c-format +# (ndt) ? +#: tests/genfile.c:353 +#, c-format +msgid "Error parsing number near `%s'" +msgstr "Errore nell'analizzare il numero vicino a \"%s\"" + +#: tests/genfile.c:359 +#, c-format msgid "Unknown date format" -msgstr "Errore di sistema sconosciuto" +msgstr "Formato data non conosciuto" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" -msgstr "" +msgstr "[ARGOMENTI...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" -msgstr "" +msgstr "impossibile aprire \"%s\"" -#: tests/genfile.c:427 -#, fuzzy +#: tests/genfile.c:425 msgid "cannot seek" -msgstr "Impossibile chiudere" +msgstr "impossibile eseguire seek" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" -msgstr "" +msgstr "il nome del file contiene caratteri NULL" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" +"impossibile generare file sparsi sullo standard output, usare l'opzione --" +"file" -#: tests/genfile.c:587 +# (ndt) ? +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" -msgstr "" +msgstr "maschera non corretta (vicino a \"%s\")" -#: tests/genfile.c:593 tests/genfile.c:626 -#, fuzzy, c-format +#: tests/genfile.c:591 tests/genfile.c:624 +#, c-format msgid "Unknown field `%s'" -msgstr " tipo di file sconosciuto %s\n" +msgstr "Campo \"%s\" sconosciuto" -#: tests/genfile.c:653 -#, fuzzy, c-format +#: tests/genfile.c:651 +#, c-format msgid "cannot set time on `%s'" -msgstr "%s: impossibile fare seek a %s" +msgstr "impossibile impostare l'orario su \"%s\"" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" -msgstr "" +msgstr "Comando eseguito con successo\n" -#: tests/genfile.c:809 -#, fuzzy, c-format +#: tests/genfile.c:807 +#, c-format msgid "Command failed with status %d\n" -msgstr "Il figlio è morto con il segnale %d" +msgstr "Comando non riuscito con lo stato %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" -msgstr "" +msgstr "Comando terminato al segnale %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" -msgstr "" +msgstr "Comando fermato al segnale %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" -msgstr "" +msgstr "Il comando ha fatto un dump del core\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" -msgstr "" +msgstr "Comando terminato\n" -#: tests/genfile.c:853 -#, fuzzy, c-format +#: tests/genfile.c:851 +#, c-format msgid "--stat requires file names" -msgstr "--Nomi di file mutilati--\n" +msgstr "--stat richiede i nomi dei file" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" -msgstr "" - -#~ msgid "block size" -#~ msgstr "dimensione dei blocchi" +msgstr "troppi argomenti" -#~ 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 "" -#~ "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.\n" -#~ "Questo programma NON HA GARANZIA, per quanto permesso dalla legge.\n" -#~ "Può essere redistribuito secondo i termini della GNU General Public " -#~ "License;\n" -#~ "si veda il file chiamato COPYING per i dettagli." - -#~ msgid "rmtd: Garbage command %c\n" -#~ msgstr "rmtd: comando spazzatura %c\n" - -#~ msgid "Quitting now." -#~ msgstr "Abbandono adesso." - -#~ msgid "WARNING: No volume header" -#~ msgstr "ATTENZIONE: intestazione del volume mancante" - -#~ msgid "Visible long name error" -#~ msgstr "Errore nel nome lungo visibile" - -#~ msgid "Time stamp out of range" -#~ msgstr "Orario fuori dai limiti" - -#~ msgid "Device number out of range" -#~ msgstr "Numero di dispositivo fuori dai limiti" - -#~ msgid "Visible longname error" -#~ msgstr "Errore nel nome lungo visibile" - -#~ msgid "Renamed %s to %s" -#~ msgstr "%s rinominato in %s" - -#~ msgid "%s: Cannot symlink to %s" -#~ msgstr "%s: impossibile fare il link simbolico a %s" - -#~ msgid "Symlinked %s to %s" -#~ msgstr "Fatto il link simbolico %s a %s" - -#~ msgid "Unknown demangling command %s" -#~ msgstr "Comando di demutilazione %s sconosciuto" - -#~ msgid "Missing file name after -C" -#~ msgstr "Manca il nome del file dopo -C" - -#~ msgid "don't change access times on dumped files" -#~ msgstr "non cambia l'orario di accesso dei file archiviati" - -#~ msgid "extract permissions information" -#~ msgstr "estrae le informazioni sui permessi" - -#~ msgid "do not extract permissions information" -#~ msgstr "non estrae le informazioni sui permessi" - -#~ msgid "FILE-OF-NAMES" -#~ msgstr "NOMI-DI-FILE" - -#~ msgid "exclude patterns are plain strings" -#~ msgstr "i modelli di esclusione sono stringhe normali" - -#~ msgid "dump instead the files symlinks point to" -#~ msgstr "archivia i file a cui puntano i link simbolici" - -#~ msgid "same as -N" -#~ msgstr "come -N" - -#~ msgid "exclude patterns use wildcards (default)" -#~ msgstr "i modelli di esclusione usano metacaratteri (predefinito)" - -#~ msgid "print total bytes written while creating archive" -#~ msgstr "stampa il numero totale di byte scritti creando l'archivio" - -#~ msgid "Print license and exit" -#~ msgstr "Mostra la licenza ed esce" - -#~ msgid "" -#~ "Based on the work of John Gilmore and Jay Fenlason. See AUTHORS\n" -#~ "for complete list of authors.\n" -#~ msgstr "" -#~ "Basato sul lavoro di John Gilmore e Jay Fenlason. Si veda il file " -#~ "AUTHORS\n" -#~ "per l'elenco completo degli autori.\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 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" -#~ " GNU tar è software libero; potete redistribuirlo e/o modificarlo\n" -#~ " secondo i termini della GNU General Public License come pubblicata\n" -#~ " dalla Free Software Foundation; la versione 2 della Licenza o\n" -#~ " (a vostra scelta) ogni versione successiva.\n" -#~ "\n" -#~ " GNU tar è distribuito nella speranza che possa essere utile,\n" -#~ " ma SENZA ALCUNA GARANZIA; anche senza la garanzia implicita di\n" -#~ " COMMERCIABILITÀ o di IDONEITÀ AD UNO SCOPO PARTICOLARE.\n" -#~ " Si consulti la GNU General Public License per ulteriori dettagli.\n" -#~ "\n" -#~ " Dovreste avere ricevuto una copia della GNU General Public License\n" -#~ " con GNU tar; altrimenti scrivete alla Free Software Foundation, Inc.,\n" -#~ " 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.\n" -#~ "\n" - -#~ msgid "Semantics of -l option will change in the future releases." -#~ msgstr "La sintassi dell'opzione -l cambierà nelle versioni future." - -#~ msgid "Please use --one-file-system option instead." -#~ msgstr "Per favore si usi invece l'opzione --one-file-system." - -#~ msgid "Warning: the -y option is not supported; perhaps you meant -j?" -#~ msgstr "Attenzione: l'opzione -y non è gestita; forse intendevi -j?" - -#~ msgid "Error in writing to standard output" -#~ msgstr "Errore scrivendo sullo standard output" - -#~ msgid "Cannot dup" -#~ msgstr "impossibile usare dup" - -#~ msgid "Cannot use compressed or remote archives" -#~ msgstr "Impossibile usare archivi compressi o remoti" - -#~ msgid "tar (child)" -#~ msgstr "tar (figlio)" - -#~ msgid "tar (grandchild)" -#~ msgstr "tar (nipote)" - -#~ msgid "Child returned status %d" -#~ msgstr "Il figlio ha restituito lo status %d" - -#~ msgid "Member names contain `..'" -#~ msgstr "I nomi dei membri contengono `..'" - -#~ msgid "%s: Member name contains `..'" -#~ msgstr "%s: I nomi dei membri contengono `..'" - -#~ 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' salva molti file insieme in un solo archivio su nastro o su " -#~ "disco\n" -#~ "e può ripristinare singoli file dall'archivio.\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" -#~ "Se una opzione lunga indica un argomento come obbligatorio, allora lo è " -#~ "anche\n" -#~ "per l'opzione corta equivalente. Lo stesso vale per gli argomenti " -#~ "opzionali.\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" -#~ "Modi operativi principali:\n" -#~ " -t, --list elenca il contenuto dell'archivio\n" -#~ " -x, --extract, --get estrae i file da un archivio\n" -#~ " -c, --create crea un nuovo archivio\n" -#~ " -d, --diff, --compare cerca differenze tra l'archivio e il file " -#~ "system\n" -#~ " -r, --append accoda i file alla fine di un archivio\n" -#~ " -u, --update accoda solo i file più nuovi della copia in " -#~ "archivio\n" -#~ " -A, --catenate aggiungi il contenuto di un altro archivio\n" -#~ " --concatenate come -A\n" -#~ " --delete cancella da un archivio (non su nastri " -#~ "magnetici!)\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" -#~ " --overwrite overwrite existing files when extracting\n" -#~ " --overwrite-dir overwrite directory metadata when " -#~ "extracting\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" -#~ msgstr "" -#~ "\n" -#~ "Modificatori delle operazioni:\n" -#~ " -W, --verify prova a verificare l'archivio dopo averlo " -#~ "scritto\n" -#~ " --remove-files cancella i file dopo averli aggiunti " -#~ "all'archivio\n" -#~ " -k, --keep-old-files nell'estrazione non sovrascrive file " -#~ "esistenti\n" -#~ " --overwrite sovrascrive i file esistenti durante " -#~ "l'estrazione\n" -#~ " --overwrite-dir sovrascrive i metadati delle directory " -#~ "durante\n" -#~ " l'estrazione\n" -#~ " -U, --unlink-first cancella ogni file prima di estrarre su di " -#~ "esso\n" -#~ " --recursive-unlink svuota le directory prima di estrarle\n" -#~ " -S, --sparse gestisce efficientemente i file sparsi\n" -#~ " -O, --to-stdout estrae i file su standard output\n" -#~ " -G, --incremental gestisce i vecchi backup incrementali GNU\n" -#~ " -g, --listed-incremental=FILE gestisce i nuovi backup incrementali " -#~ "GNU\n" -#~ " --ignore-failed-read non esce con non-zero con file illeggibili\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" -#~ "Gestione degli attributi dei file:\n" -#~ " --owner=NOME forza NOME come proprietario dei file " -#~ "aggiunti\n" -#~ " --group=NOME forza NOME come gruppo dei file aggiunti\n" -#~ " --mode=CAMBI forza il modo (simbolico) CAMBI per i " -#~ "file\n" -#~ " aggiunti\n" -#~ " --atime-preserve non cambia il tempo di accesso dei file " -#~ "archiv.\n" -#~ " -m, --modification-time non estrae il tempo di ultima modifica del " -#~ "file\n" -#~ " --same-owner cerca di estrarre i file con lo stesso " -#~ "proprietario\n" -#~ " --no-same-owner estrare i file come te stesso\n" -#~ " --numeric-owner usa sempre i numeri per i nomi di utente/" -#~ "gruppo\n" -#~ " -p, --same-permissions estrae tutti i permessi\n" -#~ " --no-same-permissions non estrae le informazioni sui permessi\n" -#~ " --preserve-permissions come -p\n" -#~ " -s, --same-order ordina i nomi da estrarre come " -#~ "nell'archivio\n" -#~ " --preserve-order come -s\n" -#~ " --preserve come -s e -p insieme\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" -#~ " --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" -#~ "Selezione e cambio del dispositivo:\n" -#~ " -f, --file=ARCHIVIO usa come archivio il file o il " -#~ "dispositivo\n" -#~ " ARCHIVIO\n" -#~ " --force-local l'archivio è locale anche se contiene " -#~ "`:'\n" -#~ " --rsh-command=COMANDO usa la shell remota COMANDO al posto di " -#~ "rsh\n" -#~ " -[0-7][lmh] specifica il drive e la densità\n" -#~ " -M, --multi-volume crea/elenca/estrai archivi multi-volume\n" -#~ " -L, --tape-length=NUM cambia nastro dopo aver scritto NUMx1024 " -#~ "byte\n" -#~ " -F, --info-script=FILE esegui lo script FILE alla file di ogni " -#~ "nastro\n" -#~ " (implica -M)\n" -#~ " --new-volume-script=FILE come -F FILE\n" -#~ " --volno-file=FILE usa/aggiorna il numero del volume in " -#~ "FILE\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" -#~ "Blocking dei dispositivi:\n" -#~ " -b, --blocking-factor=BLOCCHI usa record di BLOCCHI x 512 byte\n" -#~ " --record-size=SIZE usa record di SIZE bytes, multiplo di " -#~ "512\n" -#~ " -i, --ignore-zeros ignora blocchi azzerati nel archivio\n" -#~ " (significa EOF)\n" -#~ " -B, --read-full-records reblock in lettura (per le pipe di " -#~ "4.2BSD)\n" - -#~ 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" -#~ "Selezione formato di archiviazione:\n" -#~ " -V, --label=NOME crea un archivio con nome di volume " -#~ "NOME\n" -#~ " MODELLO durante l'elencazione/estrazione, " -#~ "MODELLO\n" -#~ " è un globbing pattern\n" -#~ " -o, --old-archive, --portability scrive un archivio in formato V7\n" -#~ " --posix scrive un archivio in formato POSIX\n" -#~ " -j, --bzip2, filtra l'archivio attraverso bzip2\n" -#~ " -z, --gzip, --ungzip filtra l'archivio attraverso gzip\n" -#~ " -Z, --compress, --uncompress filtra l'archivio attraverso " -#~ "compress\n" -#~ " --use-compress-program=PROG filtra usando PROG (deve accettare -" -#~ "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" -#~ msgstr "" -#~ "\n" -#~ "Selezione dei file locali:\n" -#~ " -C, --directory=DIR si sposta nella directory DIR\n" -#~ " -T, --files-from=NOME prende i nomi da estrarre o creare dal file " -#~ "NOME\n" -#~ " --null -T legge nomi terminati da null, disabilita -" -#~ "C\n" -#~ " --exclude=MODELLO esclude i file i cui nomi soddisfano il " -#~ "MODELLO\n" -#~ " -X, --exclude-from=FILE esclude i modelli elencati nel file FILE\n" -#~ " --anchored i modelli di esclusione vengono confrontati " -#~ "con\n" -#~ " l'inizio del nome del file (predefinito)\n" -#~ " --no-anchored i modelli di esclusione vengono confrontati dopo " -#~ "ogni /\n" -#~ " --ignore-case le esclusioni ignorano maiuscole/minuscole\n" -#~ " --no-ignore-case le esclusioni considerano le maiuscole " -#~ "(predef.)\n" -#~ " --wildcards i modelli di esclusione usano i metacaratteri " -#~ "(pred.)\n" -#~ " --no-wildcards i modelli di esclusione sono stringhe " -#~ "normali\n" -#~ " --wildcards-match-slash i metacaratteri possono corrispondere a / " -#~ "(pred.)\n" -#~ " --no-wildcards-match-slash i metacaratteri non possono " -#~ "corrispondere a /\n" -#~ " -P, --absolute-names non rimuove lo '/' iniziale dai nomi dei " -#~ "file\n" -#~ " -h, --dereference archivia il file a cui punta il symlink\n" -#~ " --no-recursion non attraversa automaticamente le directory\n" -#~ " -l, --one-file-system resta nel file system locale durante la " -#~ "creazione\n" -#~ " -K, --starting-file=NOME comincia dal file NOME nell'archivio\n" - -#~ msgid "" -#~ " -N, --newer=DATE only store files newer than DATE\n" -#~ " --newer-mtime=DATE compare date and time when data changed " -#~ "only\n" -#~ " --after-date=DATE same as -N\n" -#~ msgstr "" -#~ " -N, --newer=DATA archivia solo i file più recenti di DATA\n" -#~ " --newer-mtime=DATA confronta data e ora solo quando il " -#~ "contenuto è\n" -#~ " cambiato\n" -#~ " --after-date=DATE come -N\n" - -#~ msgid "" -#~ " --backup[=CONTROL] backup before removal, choose version " -#~ "control\n" -#~ " --suffix=SUFFIX backup before removal, override usual " -#~ "suffix\n" -#~ msgstr "" -#~ " --backup[=CONTROLLO] backup prima di rimuovere, scegli il\n" -#~ " controllo di versione\n" -#~ " --suffix=SUFFSSO backup prima di rimuovere, cambia " -#~ "suffisso\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" -#~ " --totals print total bytes written while creating archive\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" -#~ "Output informativo:\n" -#~ " --help mostra questo aiuto ed esce\n" -#~ " --version mostra le informazioni sulla versione ed esce\n" -#~ " -v, --verbose elenca prolissamente i files gestiti\n" -#~ " --checkpoint leggendo l'archivio stampa i nomi delle " -#~ "directory\n" -#~ " --totals stampa i byte scritti in totale creando " -#~ "l'archivio\n" -#~ " -R, --block-number mostra il numero di blocco nell'archivio con " -#~ "ogni\n" -#~ " messaggio\n" -#~ " -w, --interactive chiede conferma per ogni azione\n" -#~ " --confirmation come -w\n" - -#~ msgid "" -#~ "\n" -#~ "GNU tar cannot read nor produce `--posix' archives. If POSIXLY_CORRECT\n" -#~ "is set in the environment, GNU extensions are disallowed with `--posix'.\n" -#~ "Support for POSIX is only partially implemented, don't count on it yet.\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 `-f%s -b%d'.\n" -#~ msgstr "" -#~ "\n" -#~ "GNU tar non può leggere nè produrre archivi `--posix'. Se nell'ambiente " -#~ "è\n" -#~ "impostato POSIXLY_CORRECT, `--posix' vieta le estensioni GNU.\n" -#~ "La gestione degli archivi POSIX è implementata solo parzialmente, non\n" -#~ "contateci ancora. L'ARCHIVIO può essere un FILE, HOST:FILE oppure\n" -#~ "UTENTE@HOST:FILE; il FILE può essere un file o un dispositivo.\n" -#~ "*Questo* `tar' ha come opzioni predefinite `-f%s -b%d'.\n" - -#~ msgid "Obsolete option, now implied by --blocking-factor" -#~ msgstr "Opzione obsoleta, adesso implicata da --blocking-factor" - -#~ msgid "Obsolete option name replaced by --blocking-factor" -#~ msgstr "Nome di opzione obsoleto sostituito da --blocking-factor" - -#~ msgid "Obsolete option name replaced by --read-full-records" -#~ msgstr "Nome di opzione obsoleto sostituito da --read-full-records" - -#~ msgid "Obsolete option name replaced by --touch" -#~ msgstr "Nome di opzione obsoleto sostituito da --touch" - -#~ msgid "Obsolete option name replaced by --absolute-names" -#~ msgstr "Nome di opzione obsoleto sostituito da --absolute-names" - -#~ msgid "Obsolete option name replaced by --block-number" -#~ msgstr "Nome di opzione obsoleto sostituito da --block-number" - -#~ msgid "Obsolete option name replaced by --backup" -#~ msgstr "Nome di opzione obsoleto sostituito da --backup" - -#~ msgid "Written by John Gilmore and Jay Fenlason." -#~ msgstr "Scritto da John Gilmore e Jay Fenlason." - -#~ 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 "" -#~ "Gli argomenti che sono obbligatori per le opzioni lunghe lo sono anche " -#~ "per\n" -#~ "le opzioni corte equivalenti.\n" -#~ "\n" -#~ " -l, --file-length=LENGTH lunghezza del file generato\n" -#~ " -p, --pattern=MODELLO MODELLO è `default' o `zeros'\n" -#~ " --help mostra questo aiuto ed esce\n" -#~ " --version mostra le informazioni sulla versione ed " -#~ "esce\n" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Uscita per errore ritardata dall'errore precedente" diff --git a/po/ja.gmo b/po/ja.gmo index 7ac2a382f50b0993edc02a47e2c35853f31772af..9a8b215bc4684284cd67dee37188e20668ec2731 100644 GIT binary patch delta 11261 zcmYk?2V7TGAII^Fg1A6Lln})~icAGWL?s6*ngh)}a^fntIWhc0B{rQg3g85E;WR9V>#-=Fv|hkz8e?9-NQlWh{@Su^Z}s zqcIR?#qG zxu_0SK|OdVs(vYQigN({@F8lT?tInE14B^{YJ;IT3N@l7SRJ#GS#|EAZXC?;n_@%M zUdTdSx6$TjQA_v}YJf$#iAEfTWw8~~?skUQh6TuSJ4exlzoM3)cn!z##~K)c%}_TO zj#}fn*6rv)eh%~FdDO@+B7=3FqBdt-P1E5d^yT?Z%iIEMgnH0m)TWt;+GGc8{sXcd zoDepGY=N4g@u;a>g3tGbmccxHaR-G-#xz0`0RF$h` zdYXpnNMF>5XQJN3P1p!8qHY{g+jO8cYUCNH`>sTFUDa^k%T~vzc zadQkHABuW#CWhc@)Qyf{3H%OS_&e%B0rkvvF<6c~1&d)1

KpYDTxC?sE-wpXc@5 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 delta 11501 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 S{jD^v+L!h?bM%HoLH`FRg*J)+ diff --git a/po/ja.po b/po/ja.po index d4b0894..9a523c4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.19.90\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2008-02-09 09:10+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" @@ -83,7 +83,7 @@ msgstr " [ msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï `%s --help' ¤Þ¤¿¤Ï `%s --usage' ¤Ç.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Þ¤Ç.\n" @@ -92,15 +92,15 @@ msgstr " msgid "Unknown system error" msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "¤³¤Î¥Ø¥ë¥×°ìÍ÷¤òɽ¼¨" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "û¤¤»ÈÍÑË¡¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NAME" @@ -113,11 +113,11 @@ msgstr " msgid "SECS" msgstr "SECS" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "SECS ÉÃÄä»ß (ɸ½à 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "¥×¥í¥°¥é¥à¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨" @@ -135,7 +135,7 @@ msgstr "%s: msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(¥×¥í¥°¥é¥à¥¨¥é¡¼) ¥ª¥×¥·¥ç¥óǧ¼±ÉÔǽ!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼" @@ -194,16 +194,16 @@ msgstr "%s: msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ë¤Ï°ú¿ô¤Ï¤¢¤ê¤Þ¤»¤ó\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "¥á¥â¥ê¤ò»È¤¤ÀÚ¤ê¤Þ¤·¤¿" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "¸½ºß¤Î¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤òµ­Ï¿¤Ç¤­¤Þ¤»¤ó" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "½é´ü¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" @@ -322,11 +322,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[yY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -554,103 +566,103 @@ msgstr " msgid "Garbage command" msgstr "ÉÔÍפʥ³¥Þ¥ó¥É" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "¤³¤ì¤Ï tar ¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Áí½ñ¤­½Ð¤·¥Ð¥¤¥È¿ô" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "ÁíÆɤ߹þ¤ß¥Ð¥¤¥È¿ô" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Áíºï½ü¥Ð¥¤¥È¿ô: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(¥Ñ¥¤¥×)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "record_size ¤¬Ìµ¸ú¤ÊÃͤǤ¹" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "¥¢¡¼¥«¥¤¥Ö̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "ɸ½àÆþ½ÐÎϤΥ¢¡¼¥«¥¤¥Ö¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï°µ½Ì¤µ¤ì¤Æ¤¤¤Þ¤¹. %s ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤Þ¤»¤ó" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "¥Æ¡¼¥×¤ÎÀèƬ¤Ç¤¹. ½èÍý¤òÃæ»ß¤·¤Þ¤¹" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤Þ¤¹. ½èÍý¤òÃæ»ß¤·¤Þ¤¹" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "µ­Ï¿¥µ¥¤¥º = %lu ¥Ö¥í¥Ã¥¯" msgstr[1] "µ­Ï¿¥µ¥¤¥º = %lu ¥Ö¥í¥Ã¥¯" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, 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:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ò¸å¤íÊý¸þ¤ËÌ᤻¤Þ¤»¤ó. -i ¤Ê¤·¤Ç¤ÏÆɤá¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó." -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ¤òµ­Ï¿¤Î¶­³¦¤Ç»ß¤á¤Þ¤»¤ó" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: ̵¸ú¤Ê¥Ü¥ê¥å¡¼¥àÈÖ¹æ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "¥Ü¥ê¥å¡¼¥àÈֹ椬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¤·¤Þ¤·¤¿" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "¥Ü¥ê¥å¡¼¥à #%d (%s) ¤ò½àÈ÷¤·¤Þ¤¹. ¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "¥æ¡¼¥¶¤¬±þÅú¤¹¤ë EOF ¤¬É¬ÍפȤʤê¤Þ¤¹" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "·Ù¹ð: ¥¢¡¼¥«¥¤¥Ö¤¬ÉÔ´°Á´¤Ç¤¹" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -662,66 +674,67 @@ msgstr "" " q tar ¤ò½ªÎ»\n" " y ¤Þ¤¿¤Ï²þ¹Ô Áàºî¤ò·Ñ³\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! ¥µ¥Ö¥·¥§¥ë¤òµ¯Æ°\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? ¤³¤Î¥ê¥¹¥È¤òɽ¼¨\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "¿·¤·¤¤¥Ü¥ê¥å¡¼¥à¤¬¤¢¤ê¤Þ¤»¤ó. ½ªÎ»¤·¤Þ¤¹.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "¥Õ¥¡¥¤¥ë̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó. ¤â¤¦°ìÅÙ.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "ÉÔÀµ¤ÊÆþÎÏ. ? ¤Ç¥Ø¥ë¥×¤òɽ¼¨\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "%s ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s ¤Ï¤³¤Î¥Ü¥ê¥å¡¼¥à¾å¤Ç¤ª¤½¤é¤¯Ï¢Â³¤·¤Æ¤¤¤Þ¤¹: ¥Ø¥Ã¥À¤Ï¾Êά¤µ¤ì¤¿Ì¾Á°¤ò´Þ¤ó¤Ç" "¤¤¤Þ¤¹" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s ¤Ï¤³¤Î¥Ü¥ê¥å¡¼¥à¾å¤ÇϢ³¤·¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s ¤ÏÉÔÀµ¤Ê¥µ¥¤¥º¤Ç¤¹ (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "¤³¤Î¥Ü¥ê¥å¡¼¥à¤ÏϢ³¤·¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï %s ¤Ë°ìÃפ¹¤ë¥é¥Ù¥ë¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "¥Ü¥ê¥å¡¼¥à %s ¤Ï %s ¤Ë°ìÃפ·¤Þ¤»¤ó" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -729,6 +742,11 @@ msgstr "" "%s: ¥Õ¥¡¥¤¥ë̾¤¬Ä¹²á¤®¤Æ GNU ¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À¤ËÊݸ¤Ç¤­¤Ê¤¤¤Î¤ÇÀÚ¤ê¼Î¤Æ" "¤Þ¤¹" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek ¤òµ­Ï¿¤Î¶­³¦¤Ç»ß¤á¤Þ¤»¤ó" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -740,8 +758,8 @@ msgstr[1] "%lu msgid "Contents differ" msgstr "ÆâÍƤ¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Ëͽ´ü¤»¤Ì EOF ¤¬¤¢¤ê¤Þ¤¹" @@ -858,7 +876,7 @@ msgstr[1] "%s: %s msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: ¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤¢¤ë¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "ÆâÍƤò¥À¥ó¥×¤·¤Þ¤»¤ó" @@ -887,7 +905,7 @@ msgstr "%s: msgid "%s: File removed before we read it" msgstr "%s: Æɤ߹þ¤ß°ÊÁ°¤Ëºï½ü¤µ¤ì¤Þ¤·¤¿" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¥À¥ó¥×¤·¤Þ¤»¤ó" @@ -938,165 +956,165 @@ msgstr "%s: msgid "Extracting contiguous files as regular files" msgstr "Ϣ³¤·¤¿¥Õ¥¡¥¤¥ë¤òÀµ¾ï¤Ê¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼è¤ê½Ð¤·¤Þ¤¹" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¥Ï¡¼¥É¥ê¥ó¥¯¤È¤·¤Æ¼è¤ê½Ð¤·¤Æ¤ß¤Þ¤¹" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "%s ¤òÆɤ߹þ¤ßÃæ¤Ç¤¹\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: ¼è¤ê½Ð¤»¤Þ¤»¤ó -- ¥Õ¥¡¥¤¥ë¤ÏÊ̤Υܥê¥å¡¼¥à¤«¤é³¤¤¤Æ¤¤¤Þ¤¹" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "ͽ´ü¤»¤ÌŤ¤Ì¾Á°¥Ø¥Ã¥À" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: ̤ÃΤΥե¡¥¤¥ë¥¿¥¤¥× '%c', Ä̾ï¥Õ¥¡¥¤¥ë¤È¤·¤ÆÃê½Ð" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "¸½ºß¤Î %s ¤ÎÊý¤¬¿·¤·¤¤¤«Æ±¤¸" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: ¤³¤Î¥Õ¥¡¥¤¥ë¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "%s ¤Î̾Á°¤ò %s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "¥¨¥é¡¼¤ò²óÉü¤Ç¤­¤Þ¤»¤ó: ľ¤Á¤Ë½ªÎ»¤·¤Þ¤¹" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬ %s ¤«¤éÊѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï¿·¤·¤¯ºî¤é¤ì¤Þ¤·¤¿" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "̵¸ú¤Ê¥¿¥¤¥à¥¹¥¿¥ó¥×" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (ÉÃ)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (¥Ê¥ÎÉÃ)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "̵¸ú¤Ê¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤Ç¤¹" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "̵¸ú¤Ê inode ÈÖ¹æ" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ßÃæ¤Ë¥Õ¥£¡¼¥ë¥É¤¬Ä¹²á¤®¤Þ¤¹" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ËÆɤ߹þ¤ß¥¨¥é¡¼" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì EOF" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì¥Õ¥£¡¼¥ë¥ÉÃÍ" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "½ªÃ¼µ­Ï¿¤Ê¤·" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "ÉÔÀµ¤ÊÁýʬ¥Õ¥¡¥¤¥ë·Á¼°" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "̤¼ÂÁõ¤ÎÁýʬ·Á¼°¥Ð¡¼¥¸¥ç¥ó: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬½ÅÊ£" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'R' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤¬ 'R' ¤ÎÁ°¤Ë¤Ê¤¤" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë¥Ç¡¼¥¿¤Î½ªÃ¼" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬Ì¤»ÈÍÑ" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "¥Æ¥ó¥×¥ì¡¼¥È %s ¤ò»È¤Ã¤Æ°ì¼¡¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ì¤Þ¤»¤ó" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤Þ¤»¤ó: ¾õÂÖ¤¬Ê¬¤«¤ê¤Þ¤»¤ó" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°Û¤Ê¤ë¥Ç¥Ð¥¤¥¹¾å¤Ë¤¢¤ë¤Î¤Ç¾Ãµî¤·¤Þ¤»¤ó" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ¤òºï½ü\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: ºï½ü¤Ç¤­¤Þ¤»¤ó" @@ -1116,86 +1134,86 @@ msgstr " msgid "block %s: ** End of File **\n" msgstr "¥Ö¥í¥Ã¥¯ %s: ** ¥Õ¥¡¥¤¥ë¤Î½ªÃ¼ **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "¥Ö¥í¥Ã¥¯ %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "8 ¿Ê¿ôÃÍ %.*s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÇѤ줿 base-64 ¥Ø¥Ã¥À¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Éä¹æÉÕ¤­ base-64 ʸ»úÎó %s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎÃÍ %s ¤Ï %s ¤ÎÈÏ°Ï %s..%s Æâ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " %s ¤Ø¤Î¥ê¥ó¥¯\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " ÉÔÌÀ¤Ê¥Õ¥¡¥¤¥ë¥¿¥¤¥× %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Ť¤¥ê¥ó¥¯--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Ť¤Ì¾Á°--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--¥Ð¥¤¥È %s ¤ÇϢ³--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®:" @@ -1232,24 +1250,24 @@ msgstr " #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¤Îʸ»ú¤¬¥Õ¥¡¥¤¥ë̾¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹." -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "--wildcards ¤Ç¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¤òÍ­¸ú¤Ë, ¤Þ¤¿ --no-wildcards ¤Ç" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "¤³¤Î·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: ¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: ¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" @@ -1274,7 +1292,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "ÉÔÌÀ¤Ê°úÍÑ·Á¼° `%s', `%s --quoting-style=help' ¤Ç°ìÍ÷ɽ¼¨." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1293,7 +1311,7 @@ msgstr "" " tar -tvf archive.tar # archive.tar Æâ¤ÎÁ´¥Õ¥¡¥¤¥ë¤ò¾Ü¤·¤¯°ìÍ÷ɽ¼¨\n" " tar -xf archive.tar # archive.tar ¤«¤éÁ´¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤¹\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1314,86 +1332,86 @@ msgstr "" " ¤½¤¦¤Ç¤Ê¤±¤ì¤Ðñ¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë\n" " never, simple ¾ï¤Ëñ½ã¤Ê¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "¼çÁàºî¥â¡¼¥É:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎÆâÍƤò°ìÍ÷ɽ¼¨" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤«¤é¥Õ¥¡¥¤¥ë¤òÃê½Ð" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "¿·¤·¤¤¥¢¡¼¥«¥¤¥Ö¤òºîÀ®" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "¥¢¡¼¥«¥¤¥Ö¤È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤Î°ã¤¤¤ò¸«ÉÕ¤±¤ë" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎËöÈø¤Ë¥Õ¥¡¥¤¥ë¤òÄɲÃ" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î¤ß¤òÄɲÃ" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë tar ¥Õ¥¡¥¤¥ë¤òÄɲÃ" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "¥¢¡¼¥«¥¤¥Ö¤«¤éºï½ü (¼§µ¤¥Æ¡¼¥×¾å¤Ç¤Ï¥À¥á!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "¥¢¡¼¥«¥¤¥Ö¤Î¥Ü¥ê¥å¡¼¥à¥é¥Ù¥ë¤ò¥Æ¥¹¥È¤·¤Æ½ªÎ»" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Áàºî¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ëÉղõ¡Ç½:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "¤Þ¤Ð¤é¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ò¸ú²ÌŪ¤Ë½èÍý" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "¤Þ¤Ð¤é (sparse) ·Á¼°¤Î¥Ð¡¼¥¸¥ç¥ó¤òÀßÄê (--sparse ¤Î°ÕÌ£¤ò´Þ¤à)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "¸Å¤¤ GNU ·Á¼°¤Î¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò½èÍý" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FILE" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "¿·¤·¤¤ GNU ·Á¼°¤Î¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò½èÍý" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "Æɤ߹þ¤á¤Ê¤¤¥Õ¥¡¥¤¥ë¾å¤ËÈó¥¼¥í¤Î¾õÂ֤Ǹºß¤·¤Þ¤»¤ó" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMBER" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1405,116 +1423,116 @@ msgstr "" "¥Õ¥¡¥¤¥ë°ìÍ÷¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤« -T ¥ª¥×¥·¥ç¥ó·Ðͳ¤Î¤É¤Á¤é¤«¤Ç»ØÄꤵ¤ì¤¿¾ì¹ç¤Î" "¤ßÍ­¸ú. NUMBER ¤Ïɸ½à¤Ç 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï¸¡º÷²Äǽ" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "À©¸æ¤ò¾å½ñ¤­:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "¥¢¡¼¥«¥¤¥Ö¤ò½ñ¤­½Ð¤·¤¿¸å¤Ë¸¡¾Ú" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤Ë²Ã¤¨¤¿¸å¤Çºï½ü" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "¥¢¡¼¥«¥¤¥Ö¥³¥Ô¡¼¤è¤ê¿·¤·¤¤´û¸¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "³Æ¡¹¤Î¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æ¾å½ñ¤­¤¹¤ëÁ°¤Ëºï½ü" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¼è¤ê½Ð¤¹Á°¤Ë³¬Áؤò¶õ¤Ë" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "´û¸¥Ç¥£¥ì¥¯¥È¥ê¤Î¥á¥¿¥Ç¡¼¥¿¤òÊݸ" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¥Ç¥£¥ì¥¯¥È¥ê¤Î¥á¥¿¥Ç¡¼¥¿¤ò¾å½ñ¤­ (ɸ½à)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "½ÐÎÏ¥¹¥È¥ê¡¼¥à¤òÁªÂò" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æɸ½à½ÐÎϤ˽ÐÎÏ" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMMAND" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤ÆÊÌ¤Î¥×¥í¥°¥é¥à¤Ë½ÐÎÏ" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "»Ò¥×¥í¥»¥¹¤Î½ªÎ»¥³¡¼¥É¤ò̵»ë" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "»Ò¥×¥í¥»¥¹¤ÎÈó¥¼¥í½ªÎ»¥³¡¼¥É¤ò¥¨¥é¡¼¤È¤·¤Æ½èÍý" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "¥Õ¥¡¥¤¥ë°À­¤Î½èÍý" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤ò NAME ¤ËÊѹ¹" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î¥°¥ë¡¼¥×¤ò NAME ¤ËÊѹ¹" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATE-OR-FILE" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "DATE-OR-FILE ¤«¤éÄɲåե¡¥¤¥ë¤Î mtime ¤òÀßÄê" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "CHANGES" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î (¥·¥ó¥Ü¥ê¥Ã¥¯) ¥â¡¼¥É¤ò CHANGES ¤ËÊѹ¹" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "METHOD" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1523,181 +1541,181 @@ msgstr "" "ºÇ½ª¥¢¥¯¥»¥¹»þ¹ï¤ò, Æɤ߹þ¤ß¸å¤ËÉü¸µ¤¹¤ë (METHOD='replace'; ɸ½à) ¤«ºÇ½é¤ËÀß" "Äꤷ¤Ê¤¤ (METHOD='system') ¤«¤Î¤É¤Á¤é¤«¤ÎÊýË¡¤Ç¥À¥ó¥×¥Õ¥¡¥¤¥ë¾å¤Ç°Ý»ý" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "¥Õ¥¡¥¤¥ë¤Î¹¹¿·»þ¹ï¤ò¼è¤ê½Ð¤µ¤Ê¤¤" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "Ʊ¤¸½êÍ­¼Ô¤Î¤Þ¤Þ¤Ç¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æ¤ß¤ë" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "¤¢¤Ê¤¿¼«¿È¤Î¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼è¤ê½Ð¤¹" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "¥æ¡¼¥¶Ì¾/¥°¥ë¡¼¥×̾¤È¤·¤Æ¾ï¤Ë¿ô»ú¤ò»È¤¦" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "¥Õ¥¡¥¤¥ë°À­¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÃê½Ð (superuser ¤Ç¤Ïɸ½à)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" "¥¢¡¼¥«¥¤¥Ö¤«¤é°À­¤òÃê½Ð¤¹¤ëºÝ¤Ë¥æ¡¼¥¶¤Î umask ¤òŬÍÑ (°ìÈ̥桼¥¶¤Ç¤Ïɸ½à)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤È¥Þ¥Ã¥Á¤µ¤»¤ë¤¿¤á¤Ë¼è¤ê½Ð¤¹Ì¾Á°¤òʤÓÂؤ¨" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "-p ¤È -s ¤ÎξÊý¤ò»ØÄꤷ¤¿¤â¤Î¤ÈƱ¤¸" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" "Ãê½Ð¤¬½ªÎ»¤¹¤ë¤Þ¤ÇÃê½Ð¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ÎºÇ½ª¹¹¿·»þ¹ï¤È°À­¤ÎÀßÄê¤òÃ٤餻¤ë" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore ¥ª¥×¥·¥ç¥ó¤Î¸ú²Ì¤ò¼è¤ê¾Ã¤·" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "¥Ç¥Ð¥¤¥¹¤ÎÁªÂò¤ÈÀÚÂØ:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥Ð¥¤¥¹ ARCHIVE ¤ò»ÈÍÑ" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ï¥³¥í¥ó¤ò´Þ¤ó¤Ç¤¤¤Æ¤â¥í¡¼¥«¥ë" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "»ØÄꤵ¤ì¤¿ rmt COMMAND ¤ò rmt ¤ÎÂå¤ï¤ê¤Ë»ÈÍÑ" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "rsh ¤ÎÂå¤ï¤ê¤Ë COMMAND ¤ò»ÈÍÑ" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "¥É¥é¥¤¥Ö¤ÈÌ©ÅÙ¤ò»ØÄê" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®/°ìÍ÷/Ãê½Ð" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "NUMBER x 1024 ¥Ð¥¤¥È¤ò½ñ¤­½Ð¤·¤¿¸å¤Ç¥Æ¡¼¥×¤òÊѹ¹" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "³Æ¡¹¤Î¥Æ¡¼¥×¤ÎºÇ¸å¤Ç¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô (-M ɬ¿Ü)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "FILE Ãæ¤Î¥Ü¥ê¥å¡¼¥àÈÖ¹æ¤ò»ÈÍÑ/¹¹¿·" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "¥Ç¥Ð¥¤¥¹¥Ö¥í¥Ã¥­¥ó¥°:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOCKS" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "¥ì¥³¡¼¥É¤¢¤¿¤ê BLOCKS x 512 ¥Ð¥¤¥È" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "¥ì¥³¡¼¥É¤¢¤¿¤ê NUMBER ¥Ð¥¤¥È. 512 ¤ÎÇÜ¿ô" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Î¥¼¥í¥Ö¥í¥Ã¥¯ (¤Ä¤Þ¤ê EOF) ¤ò̵»ë" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "Æɤ߽Ф·¤¿¤è¤¦¤ËºÆ¥Ö¥í¥Ã¥¯ (4.2BSD ¥Ñ¥¤¥×ÍÑ)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "¥¢¡¼¥«¥¤¥Ö·Á¼°¤ÎÁªÂò" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "»ØÄꤵ¤ì¤¿·Á¼°¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMAT ¤Ï¼¡¤Î¤¦¤Á¤Î 1¤Ä:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "¸Å¤¤ V7 tar ·Á¼°" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "GNU tar 1.12 °ÊÁ°¤Î·Á¼°" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x ·Á¼°" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) ·Á¼°" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) ·Á¼°" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "pax ¤ÈƱ¤¸" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "--format=v7 ¤ÈƱ¤¸" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "--format=posix ¤ÈƱ¤¸" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "keyword[[:]=value][,keyword[[:]=value]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "pax ¥­¡¼¥ï¡¼¥É¤òÀ©¸æ" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1705,171 +1723,185 @@ msgstr "" "¥Ü¥ê¥å¡¼¥à̾ TEXT ¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®. °ìÍ÷/Ãê½Ð»þ¤Ë TEXT ¤ò¥Ü¥ê¥å¡¼¥à̾¤ËÂФ¹" "¤ëÃê½Ð¥Ñ¥¿¡¼¥ó¤Ë»ÈÍÑ" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "°µ½Ì¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍÑ" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍÑ" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "bzip2 ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "gzip ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "compress ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "lzma ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "gzip ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "PROG ·Ðͳ¤Ç¥Õ¥£¥ë¥¿ (-d ¤ò¼õ¤±ÉÕ¤±¤ëɬÍפ¢¤ê)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ëÁªÂò:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "»ØÄꤵ¤ì¤¿ FILE ¤ò¥¢¡¼¥«¥¤¥Ö¤ËÄɲà (¥À¥Ã¥·¥å ' ¤Ç»Ï¤Þ¤ë¥Õ¥¡¥¤¥ë̾¤Î¾ì¹ç¤ËÊØ" "Íø)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "DIR" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ø°ÜÆ°" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "Ãê½Ð¤Þ¤¿¤ÏºîÀ®¤¹¤ë̾Á°¤ò¥Õ¥¡¥¤¥ë FILE ¤«¤é¼èÆÀ" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T ¤¬ null ¤Ç½ª¤ï¤ë̾Á°¤òÆɤ߹þ¤ß, -C ¤ò̵¸ú¤Ë" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "-T ¤ÇÆɤ߹þ¤ó¤À¥Õ¥¡¥¤¥ë̾¤ò°úÍѽªÎ»¤¹¤ë (ɸ½à)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "-T ¤ÇÆɤ߹þ¤ó¤¿¥Õ¥¡¥¤¥ë̾¤ò°úÍѽªÎ»¤·¤Ê¤¤" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "PATTERN ¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤ò½ü³°" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "FILE ¤ËÎóµó¤µ¤ì¤¿¥Ñ¥¿¡¼¥ó¤ò½ü³°" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "¥¿¥°¥Õ¥¡¥¤¥ë¼«¿È¤ò½ü¤¯ CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤò½ü³°" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¤Æ¤ò½ü³°" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "FILE ¼«¿È¤ò½ü¤¯ FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤò½ü³°" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¤Æ¤ò½ü³°" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "¥Ð¡¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¼«Æ°Åª¤Ë²¼¤Ã¤Æ¤¤¤«¤Ê¤¤" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "¥¢¡¼¥«¥¤¥ÖºîÀ®»þ¤Ë¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¸ÂÄê" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò½ç·«¤ê¤Ë²¼¤Ã¤Æ¤¤¤¯ (default)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "¥Õ¥¡¥¤¥ë̾¤«¤éÀèƬ¤Î `/' ¤ò¼è¤ê½ü¤«¤Ê¤¤" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¤¿¤É¤ë; ¤½¤ì¤é¤¬»Ø¤¹¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤·¤Æ¥À¥ó¥×" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "¥Ï¡¼¥É¥ê¥ó¥¯¤ò¤¿¤É¤ë; ¤½¤ì¤é¤¬»Ø¤¹¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤·¤Æ¥À¥ó¥×" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "MEMBER-NAME" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Î¥á¥ó¥Ð¡¼ MEMBER-NAME ¤Ç³«»Ï" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "DATE-OR-FILE ¤è¤ë¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î¤ß¤ò³ÊǼ" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATE" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿»þ¤À¤±ÆüÉÕ¤ª¤è¤Ó»þ¹ï¤òÈæ³Ó" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "ºï½üÁ°¤Ë¥Ð¡¼¥¸¥ç¥ó´ÉÍý¤ò CONTROL ¤Ë¤·¤Æ¥Ð¥Ã¥¯¥¢¥Ã¥×" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "STRING" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1877,87 +1909,87 @@ msgstr "" "ºï½üÁ°¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×, Ä̾ï¤ÎÀÜÈø¼­ (´Ä¶­ÊÑ¿ô SIMPLE_BACKUP_SUFFIX ¤¬Ì¤ÀßÄê¤Ê" "¤é '~') ¤ò¾å½ñ¤­" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "¥Õ¥¡¥¤¥ë̾ÊÑ´¹:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "Ãê½Ð»þ¤Ë¥Õ¥¡¥¤¥ë̾¤«¤éÀèƬ¤Î NUMER ¸Ä¤Î¥³¥ó¥Ý¥Í¥ó¥È¤ò½üµî" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊÑ´¹¤Ë sed ¤ÎÃÖ´¹ EXPRESSION ¤ò»ÈÍÑ" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "¥Õ¥¡¥¤¥ë̾°ìÃ×¥ª¥×¥·¥ç¥ó (½ü³°/Êñ´Þ¤Îξ¥Ñ¥¿¡¼¥ó¤ËºîÍÑ):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "Âçʸ»ú¾®Ê¸»ú¤ò̵»ë" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤È¥Ñ¥¿¡¼¥ó¤¬°ìÃ×" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "Ǥ°Õ¤Î `/' °Ê¹ß¤Ë¥Ñ¥¿¡¼¥ó¤¬°ìÃ× (ɸ½à¤Ç½ü³°)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "Âçʸ»ú¾®Ê¸»ú¤ò¹Íθ¤·¤Æ°ìÃ× (ɸ½à)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ÈÍÑ (ɸ½à¤Ç½ü³°)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "Ãà¸ìŪʸ»úÎó°ìÃ×" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ `/' ¤Ë°ìÃפ·¤Ê¤¤" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ `/' ¤Ë°ìÃ× (ɸ½à¤Ç½ü³°)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "¾ðÊó:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "½èÍý¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤ò¾éŤËɽ¼¨" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "NUMBER (ɸ½à 10) ÈÖÌܤε­Ï¿¤´¤È¤Ë¿ÊĽ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "³Æ¸¡Ìä¤Ç ACTION ¤ò¼Â¹Ô" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "Á´¤Æ¤Î¥ê¥ó¥¯¤¬¥À¥ó¥×¤µ¤ì¤Ê¤¤¾ì¹ç¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1968,112 +2000,112 @@ msgstr "" "»þ¤ËÁí¥Ð¥¤¥È¿ô¤òɽ¼¨. µö²Ä¤µ¤ì¤¿ SIGNAL ¤Ï: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 " "¤ª¤è¤Ó SIGUSR2. SIG ÀÜƬ¼­¤¬¤Ê¤¤Ì¾Á°¤Ç¤â²Ä" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "¥Õ¥¡¥¤¥ë¤Î¹¹¿·ÆüÉÕ¤ò UTC ¤Çɽ¼¨" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "¾éĹ½ÐÎϤò FILE ¤ËÁ÷¿®" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥Ö¥í¥Ã¥¯¿ô¤ò³Æ¡¹¥á¥Ã¥»¡¼¥¸ÉÕ¤­¤Çɽ¼¨" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "Á´¤Æ¤ÎÆ°ºî¤ò³Îǧ" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "tar ¤Îµ¬ÄêÃͤòɽ¼¨" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "°ìÍ÷¤äÃê½Ð»þ¤Ë, ¸¡º÷´ð½à¤Ë°ìÃפ·¤Ê¤¤¥Ç¥£¥ì¥¯¥È¥ê¤ò³Æ¡¹°ìÍ÷ɽ¼¨" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "ÊÖ´Ô¸å¤Ë¥Õ¥¡¥¤¥ë̾¤Þ¤¿¤Ï¥¢¡¼¥«¥¤¥Ö̾¤òɽ¼¨" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "̾Á°°úÍÑ·Á¼°¤òÀßÄê. Í­¸ú¤Ê STYLE Ãͤϲ¼µ­»²¾È." -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "¹¹¤Ë STRING ¤«¤éʸ»ú¤ò°úÍÑ" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "STRING ¤«¤é¤Îʸ»ú°úÍѤò̵¸ú¤Ë" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "¸ß´¹¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "ºîÀ®»þ¤Ï --old-archive ¤ÈƱ¤¸. Ãê½Ð»þ¤Ï --no-same-owner ¤ÈƱ¤¸" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "¤½¤Î¾¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "ÀøºßŪ¤Ë³²¤Ë¤Ê¤ë¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤò̵¸ú¤Ë" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' ¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á 2¤Ä°Ê¾å»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó." -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "°µ½Ì¥ª¥×¥·¥ç¥ó¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "̤ÃΤΥ·¥°¥Ê¥ë̾: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "ÆüÉÕ¥µ¥ó¥×¥ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "̤ÃΤÎÆüÉÕ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î %2$s Âå¤ï¤ê¤Ë %1$s ¤È¤·¤Þ¤¹" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "¥ª¥×¥·¥ç¥ó %s: `%s' ¤ò %s ¤È¤·¤Æ°·¤¦" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: ¥Õ¥¡¥¤¥ë°ìÍ÷¤Ï´û¤ËÆɤ߹þ¤ßºÑ¤ß" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: Æɤ߹þ¤Þ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ë¥Ì¥ëʸ»ú" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style ¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ëÍ­¸ú¤Ê°ú¿ô¤Ï:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2081,151 +2113,165 @@ msgstr "" "\n" "¡Ö¤³¤Î¡×tar ¤Îµ¬ÄêÃÍ:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "̵¸ú¤Ê¥Ö¥í¥Ã¥­¥ó¥°°ø»Ò" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "·Ù¹ð: -I ¥ª¥×¥·¥ç¥ó¤Ï¼õ¤±Æþ¤ì¤é¤ì¤Þ¤»¤ó -- ¿ʬ -j ¤« -T ¤Ê¤Î¤Ç¤Ï?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "̵¸ú¤Ê¥Æ¡¼¥×¤ÎŤµ" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "1¤Ä°Ê¾å¤ÎÉßµï¤È¤Ê¤ëÆüÉÕ" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "̵¸ú¤Ê¤Þ¤Ð¤é (sparse) ¥Ð¡¼¥¸¥ç¥óÃÍ" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ¤Ï¤³¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "--checkpoint ÃͤÏÀ°¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: ̵¸ú¤Ê¥°¥ë¡¼¥×" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥â¡¼¥É¤Ï̵¸ú¤Ç¤¹" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "̵¸ú¤Ê¿ô" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "̵¸ú¤Ê½êÍ­¼Ô" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "̵¸ú¤Êµ­Ï¿¥µ¥¤¥º" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "µ­Ï¿¥µ¥¤¥º¤Ï %d ¤ÎÇÜ¿ô¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "̵¸ú¤Ê¥¨¥ì¥á¥ó¥È¿ô" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "--to-command ¥ª¥×¥·¥ç¥ó¤Ï 1¤Ä¤À¤±µö²Ä" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "ÉÔÀµ·Á¼°¤ÎÌ©ÅÙ°ú¿ô: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "̤ÃΤÎÌ©ÅÙ: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "¥ª¥×¥·¥ç¥ó `-[0-7][lmh]' ¤Ï¡Ö¤³¤Î¡×tar ¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[¥Õ¥¡¥¤¥ë]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "¸Å¤¤¥ª¥×¥·¥ç¥ó `%c' ¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ¤Ï¥Õ¥¡¥¤¥ë°ìÍ÷¤¬¤Ê¤±¤ì¤Ð̵°ÕÌ£" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence ¤ÏÍ׵ᤵ¤ì¤¿Áàºî¥â¡¼¥É¤Ç¤Ï»È¤¨¤Þ¤»¤ó" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "ʬ³ä·¿¤Î¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ë¤Ï `-M' ¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental ¤È --newer ¤È¤ò·ë¹ç¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¥¢¡¼¥«¥¤¥Ö¤ò³Îǧ¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï³Îǧ¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¤Ë°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï»È¤¨¤Þ¤»¤ó" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤ÏÏ¢·ë¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "¶õ¤Î¥¢¡¼¥«¥¤¥ÖºîÀ®¤Ï¤´ÍƼϴꤤ¤Þ¤¹" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "¥ª¥×¥·¥ç¥ó `-Aru' ¤È `-f -' ¤È¤ÏÁêÍƤì¤Þ¤»¤ó" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "¥ª¥×¥·¥ç¥ó `-Acdtrux' ¤Î¤¦¤Á¡¢¤¤¤º¤ì¤«¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "½èÍýÃæ¤Ë¥¨¥é¡¼¤¬µ¯¤­¤Þ¤·¤¿¤¬¡¢ºÇ¸å¤Þ¤Ç½èÍý¤·¤Æ¤«¤é¥¨¥é¡¼½ªÎ»¤µ¤»¤Þ¤·¤¿" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2234,79 +2280,79 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: ¥Õ¥¡¥¤¥ë¤¬ %s ¥Ð¥¤¥È¾®¤µ¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹" msgstr[1] "%s: ¥Õ¥¡¥¤¥ë¤¬ %s ¥Ð¥¤¥È¾®¤µ¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "¥­¡¼¥ï¡¼¥É %s ¤Ï̤ÃΤޤ¿¤Ï̤¼ÂÁõ" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "¥Ñ¥¿¡¼¥ó %s ¤Ï»È¤¨¤Þ¤»¤ó" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "¥­¡¼¥ï¡¼¥É %s ¤Ïʤ¤»¤Þ¤»¤ó" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: Ťµ¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "³ÈÄ¥¥Ø¥Ã¥ÀĹ¤Ïµö²Ä¤µ¤ì¤¿Èϰϳ°¤Ç¤¹" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "³ÈÄ¥¥Ø¥Ã¥ÀĹ %*s ¤ÏÈϰϳ°¤Ç¤¹" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: Ťµ¤Î¸å¤Ë¥Ö¥é¥ó¥¯¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: = (¥¤¥³¡¼¥ë) µ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: ²þ¹Ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "̤ÃΤγÈÄ¥¥Ø¥Ã¥À¥­¡¼¥ï¡¼¥É `%s' ¤ò̵»ë" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "³ÈÄ¥¥Ø¥Ã¥À %s=%s ¤Ï %s..%s ¤ÎÈÏ°ÏÆâ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s=%s ¤ÏÉÔÀµ" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s=%s ¤Ï;ʬ" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s ¤Ï̵¸ú: ͽ´ü¤»¤Ì¶èÀÚ¤êʸ»ú %c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s ¤Ï̵¸ú: ´ñ¿ôÃÍ" @@ -2476,97 +2522,115 @@ msgstr " msgid "Negative size: %s" msgstr "Éé¤Î¥µ¥¤¥º: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) ¼ºÇÔ" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "`%s' ¤Î¶á¤¯¤Ç¿ô»ú¤ò¹½Ê¸Ê¬ÀÏ»þ¤Ë¥¨¥é¡¼" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "̤ÃΤÎÆüÉÕ·Á¼°" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGS...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "`%s' ¤ò³«¤±¤Þ¤»¤ó" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "Áܤ·½Ð¤»¤Þ¤»¤ó" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "¥Õ¥¡¥¤¥ë̾¤¬¥Ì¥ëʸ»ú¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "¤Þ¤Ð¤é¤Ê (sparse) ¥Õ¥¡¥¤¥ë¤òɸ½à½ÐÎϤ˽ñ¤­½Ð¤»¤Þ¤»¤ó. --file ¥ª¥×¥·¥ç¥ó¤ò»ÈÍÑ" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "ÉÔÀµ¤Ê¥Þ¥¹¥¯ (`%s' ¤Ë¶á¤¤)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "̤ÃΤΥե£¡¼¥ë¥É `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "`%s' ¤Ë»þ¹ï¤òÀßÄê¤Ç¤­¤Þ¤»¤ó" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "¥³¥Þ¥ó¥É¤¬Àµ¾ï½ªÎ»\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "¥³¥Þ¥ó¥É¤¬¥¹¥Æ¡¼¥¿¥¹ %d ¤Ç¼ºÇÔ\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "¥³¥Þ¥ó¥É¤¬¥·¥°¥Ê¥ë %d ¤Ç½ªÎ»\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "¥³¥Þ¥ó¥É¤¬¥·¥°¥Ê¥ë %d ¤ÇÄä»ß\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "¥³¥Þ¥ó¥É¤¬¥³¥¢¤ò¥À¥ó¥×\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "¥³¥Þ¥ó¥É¤¬½ªÎ»\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat ¤Ë¤Ï¥Õ¥¡¥¤¥ë̾¤¬É¬Í×" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹" + +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "--delay-directory-restore ¥ª¥×¥·¥ç¥ó¤Î¸ú²Ì¤ò¼è¤ê¾Ã¤·" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "" +#~ "½èÍýÃæ¤Ë¥¨¥é¡¼¤¬µ¯¤­¤Þ¤·¤¿¤¬¡¢ºÇ¸å¤Þ¤Ç½èÍý¤·¤Æ¤«¤é¥¨¥é¡¼½ªÎ»¤µ¤»¤Þ¤·¤¿" diff --git a/po/ko.gmo b/po/ko.gmo index 9735173a648653b18ce5b8a6305a0200a9b95551..7a0ed25ade63d9d11d193163ba78c64894dc98c0 100644 GIT binary patch delta 1148 zcmXxkJ!q3b9LMp0=+kOU6WgX~ZELkr6E!dGlQh~!aq$hLL-BpB4%SueAR+_@K`P>q zDmqw^4i3J6CUlWX&_$e8Fk(Pdu!Fdj7Ag4sC67lhpS$PD-Tm)>mrlnQVuf0VbH^xo z>PG4hpV>G*ZQ_IS%Q0)kMcjf**oHmLW*abpTk!zu{UmnawAX)tyXaR?^Dki^hFi?K z%nCL{Bg%urn8fp5e+D)2JZj=9ZpKv%WB(en0nDJrAHx(*;d*?80epd4cmeydirT<3 zwz9tY*P2Cm(1qGj3iX9U7{gQO;#E|D&oG0ZQR4#s#zIll_tU719mj5*Km~N!dw&Ca z=s(9e>)SgTiu8~7;xBg6kE}BzNK4=*%;GQ}#X-D|%19ZNsSl`e%Se_j$fP98!Z^mU z_M+A~M|2AGA{Ih4?$J<6ALDj>g-ZE%)cclTqaVSY^hZ$vokgYg8tMpUaT``p0si#* zolK&6^QiG>Pz(UuSuN2U=hbwctzKffZzoEuu2C;u&mj1QAGv4t#IuYXW&NV+?9)^Q zsO)J0?S8QMwP|lmKRO+bib5Z)w;BhjTQNdS756#azD)6?lML!+)o&dR6>m9xdHqZH zUve~bBHE0~ZfcgQ3$Ef)xwe*2r}WLKIi;Hay)Tr>rn4ghuDd6fOS;+8eBe!U>2CX! F?;j;mX{Z1I delta 1217 zcmXxkUr3Wt7{~Ev_-dMMsaa|>d(-?oXIr{TGa|Dfx+v%mbeX0ZR3>H#5$hr-BB&Tf zbX6chkWkF1WQuiBH!Z4*?h-@@8j;aWc2V^Gx%IMlpL5=K=bYy}&(X>1Ycs8LG7p=^@BrLjlCGc>!<)HF^peP8 z$+HgJOL_Mo9~&Xcs3N{k!-sEBsr`htm_nt#$eVs2LG?Sa9*?5}x`j&dV^k@UxE|+G z0Twg4`a4nc_Myh#^pSrZmI)pxl}XeDbEu4DlQ#`$MCP)C$SdnY)p7upsT-&rKSVw@ z#g{Vi4mo7@6SYnrb=8K;Q6=ptApeat26>>G-a{?$5w+kf*5N#A;?lx&hUzl5qXOKI z3TQavZPdKusQG4bHU2;alutA&P318f8d!&6+>HSoM*W$Lq9UF~#@ZL;+}T1#5A~v? ziw9R{pov?7DvMe`S=bOuW^JwBL`y}|r6RX3w$cUF>Da;@j0K$%&&Jp;C*WQER|E~xQZCsntrOoP0>cH#LUO3Lyz`Z&C!I^Q&`%VnH=lV|$o$7IE^$(qO z`+MENo`IpB)7|k$c}b5i)DjH0xZy}!s5KC3j$g@tm0dFZ)}2T^`!hY^CKeK7&mXui P{!V?5KaF=3Uhw<_Ih28v diff --git a/po/ko.po b/po/ko.po index 870b392..c1000ed 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.12\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 1997-05-30 22:55+0900\n" "Last-Translator: Bang Jun-Young \n" "Language-Team: Korean \n" @@ -82,7 +82,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -91,15 +91,15 @@ msgstr "" msgid "Unknown system error" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -112,11 +112,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -134,7 +134,7 @@ msgstr "" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -193,18 +193,18 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 #, fuzzy msgid "memory exhausted" msgstr "¸Þ¸ð¸®°¡ ¹Ù´Ú³²" # -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "ÇöÀç µð·ºÅ丮¸¦ ¾Ë ¼ö ¾ø½À´Ï´Ù" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -330,11 +330,23 @@ msgstr "" msgid "'" msgstr "" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -539,114 +551,114 @@ msgid "Garbage command" msgstr "¾µ¸ð¾ø´Â ¸í·É" # -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "ÀÌ°ÍÀº tar ¾ÆÄ«À̺êó·³ º¸ÀÌÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " # -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 #, fuzzy msgid "Total bytes read" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " # -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" # -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "¾ÆÄ«À̺ê À̸§ÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù" # -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Ç¥ÁØÀÔ/Ãâ·Â ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" # -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °»½ÅÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Å×ÀÌÇÁÀÇ ½ÃÀÛ ºÎºÐ¿¡¼­ Áö±Ý Á¾·áÇÔ" # -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Á¾·áÇÕ´Ï´Ù" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "" -msgstr[1] "" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "·¹ÄÚµå Å©±â = %d ºí·°" msgstr[1] "·¹ÄÚµå Å©±â = %d ºí·°" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "" +msgstr[1] "" + +#: src/buffer.c:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "" # -#: src/buffer.c:909 +#: src/buffer.c:929 #, fuzzy, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "º¼·ý #%d(%s¸¦ À§ÇÑ)¸¦ ÁغñÇÏ°í ¸®ÅÏÀ» Ä¡¼¼¿ä: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "»ç¿ëÀÚÀÇ ÀÀ´äÀÌ ÇÊ¿äÇÑ °÷¿¡ EOF°¡ ÀÖÀ½" # -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "°æ°í: ¾ÆÄ«À̺갡 ºÒ¿ÏÀüÇÕ´Ï´Ù" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -658,74 +670,81 @@ msgstr "" " ! ¼­ºê¼ÐÀ» ½ÇÇàÇÕ´Ï´Ù\n" " ? ÀÌ ¸ñ·ÏÀ» ÀμâÇÕ´Ï´Ù\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" # -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "»õ º¼·ýÀÌ ¾Æ´Ô; Á¾·á.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "" # -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s´Â ÀÌ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s´Â ÀÌ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, fuzzy, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s´Â À߸øµÈ Å©±âÀÔ´Ï´Ù (%ld != %ld + %ld)" # -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "ÀÌ º¼·ýÀº ¼ø¼­¸¦ ¹þ¾î³µ½À´Ï´Ù" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, fuzzy, c-format msgid "Archive not labeled to match %s" msgstr "`%s'¿Í ÀÏÄ¡Çϵµ·Ï ¶óº§ÀÌ ºÙÁö ¾ÊÀº ¾ÆÄ«À̺ê" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "º¼·ý `%s'°¡ `%s'¿Í ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +# +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "ºí·° °æ°è°¡ ¾Æ´Ñ ºÎºÐ¿¡¼­ ¾ÆÄ«À̺ê %sÀÇ EOF °ËÃâ" + # #: src/compare.c:96 #, fuzzy, c-format @@ -740,8 +759,8 @@ msgid "Contents differ" msgstr "¸ðµå°¡ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "¾ÆÄ«À̺꿡 ¿¹±âÄ¡ ¾ÊÀº EOF" @@ -876,7 +895,7 @@ msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: ´Ù¸¥ ÆÄÀϽýºÅÛ »ó¿¡ ÀÖÀ½; ´ýÇÁµÇÁö ¾ÊÀ½" # -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 #, fuzzy msgid "contents not dumped" msgstr " (ÄÚ¾î Ãâ·ÂµÊ)" @@ -910,7 +929,7 @@ msgstr "%s msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -963,183 +982,183 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "¿¬¼ÓµÇ¾î ÀÖ´Â ÆÄÀÏÀ» ÀÏ¹Ý ÆÄÀÏ·Î ÃßÃâÇÔ" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "±âÈ£ ¸µÅ©¸¦ ÇÏµå ¸µÅ©·Î ÃßÃâÇÏ°í ÀÖ½À´Ï´Ù" # -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "%s¸¦ Àд Áß\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, fuzzy, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "`%s'¸¦ ÃßÃâÇÒ ¼ö ¾ø½À´Ï´Ù -- ÀÌ ÆÄÀÏÀº ´Ù¸¥ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖ½À´Ï´Ù" # -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" # -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ; ÆÄÀÏÀÌ ¹«½ÃµÊ" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: ÀÌ ÆÄÀÏÀ» ¹é¾÷ÇÒ ¼ö ¾ø¾ú½À´Ï´Ù" # -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "%s¸¦ %s·Î À̸§À» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "" # -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" # -#: src/incremen.c:400 +#: src/incremen.c:457 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" # -#: src/incremen.c:441 +#: src/incremen.c:502 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "%s´Â »õ µð·ºÅ丮ÀÔ´Ï´Ù" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" # -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 #, fuzzy msgid "Read error in snapshot file" msgstr "%s¿¡¼­ Àб⠿À·ù" # -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" # -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" # -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" # -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s¸¦ Áö¿ò\n" # -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "%s¸¦ Áö¿ï ¼ö ¾ø½À´Ï´Ù" @@ -1160,92 +1179,92 @@ msgstr " msgid "block %s: ** End of File **\n" msgstr "ºí·° %10ld: ** ÆÄÀÏÀÇ ³¡ **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, fuzzy, c-format msgid "block %s: " msgstr "ºí·° %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" # -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" # -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " %s·Î ¸µÅ©\n" # -#: src/list.c:1225 +#: src/list.c:1234 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ `%c'\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" # -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--º¼·ý Çì´õ--\n" # -#: src/list.c:1259 +#: src/list.c:1268 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--%ld ¹ÙÀÌÆ® °¿¡ °è¼ÓµÊ--\n" # -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "µð·ºÅ丮¸¦ ¸¸µå´Â Áß:" @@ -1289,26 +1308,26 @@ msgstr "" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" # -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: ¾ÆÄ«À̺꿡 ¾øÀ½" # -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: ¾ÆÄ«À̺꿡 ¾øÀ½" @@ -1333,7 +1352,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1344,7 +1363,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1356,88 +1375,88 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" # -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "¾ÆÄ«À̺꿡 ¿¹±âÄ¡ ¾ÊÀº EOF" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1445,562 +1464,576 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" # -#: src/tar.c:431 +#: src/tar.c:433 #, fuzzy msgid "remove files after adding them to the archive" msgstr "¾ÆÄ«À̺꿡 ÀÖ´Â À̸§µé¿¡¼­ µå¶óÀ̺ê ÁöÁ¤¹®À» Á¦°ÅÇÔ" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" # -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" # -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Ç¥ÁØÀԷ¿¡ ´ëÇÑ ¾ÆÄ«À̺ê" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Çò°¥¸®´Â ¾ÐÃà ¿É¼Ç" -#: src/tar.c:594 +#: src/tar.c:596 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "¾ÐÃà ÇÁ·Î±×·¥¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "" -#: src/tar.c:606 +# +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s´Â ¾ÆÄ«À̺êÀÔ´Ï´Ù; ´ýÇÁµÇÁö ¾ÊÀ½" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" # -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" # -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Àý´ë ¸µÅ©µé¿¡¼­ ¾Õ¿¡ ºÙÀº `/'¸¦ Á¦°ÅÇÔ" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "º¼·ý `%s'°¡ `%s'¿Í ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2008,225 +2041,231 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" # -#: src/tar.c:730 +#: src/tar.c:740 #, fuzzy msgid "ask for confirmation for every action" msgstr "»ç¿ëÀÚÀÇ È®ÀÎÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' ¿É¼Ç Áß Çϳª ÀÌ»óÀ» ÁöÁ¤ÇÏ¸é ¾È µË´Ï´Ù" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Çò°¥¸®´Â ¾ÐÃà ¿É¼Ç" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "¾Ë ¼ö ¾ø´Â ÆÐÅÏ `%s'" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "" -#: src/tar.c:1760 +#: src/tar.c:1797 #, fuzzy msgid "Invalid owner" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¼ÒÀ¯ÀÚ°¡ ÁÖ¾îÁü" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 #, fuzzy msgid "Invalid record size" msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "·¹ÄÚµå Å©±â´Â %dÀÇ ¹è¼ö°¡ µÇ¾î¾ß ÇÕ´Ï´Ù." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "¾Ë ¼ö ¾ø´Â ÆÐÅÏ `%s'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "`-[0-7][lmh]' ¿É¼ÇÀº ÀÌ tar¿¡¼± Áö¿øµÇÁö ¾Ê½À´Ï´Ù" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "´ÙÁß ¾ÆÄ«À̺ê ÆÄÀÏÀº `-M' ¿É¼ÇÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2234,45 +2273,53 @@ msgstr[0] "" msgstr[1] "" # -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "¾ÐÃàµÈ ´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °»½ÅÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "`-Aru' ¿É¼ÇÀº `-f -'°ú µ¿½Ã¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "`-Acdtrux' ¿É¼Çµé Áß Çϳª¸¦ ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" +msgid "Exiting with failure status due to previous errors" msgstr "" # @@ -2283,79 +2330,79 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: ÆÄÀÏÀÌ %d ¹ÙÀÌÆ® ÁÙ¾îµë, (¿Í¿ì!)" msgstr[1] "%s: ÆÄÀÏÀÌ %d ¹ÙÀÌÆ® ÁÙ¾îµë, (¿Í¿ì!)" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2520,100 +2567,110 @@ msgstr "" msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "¾Ë ¼ö ¾ø´Â ½Ã½ºÅÛ ¿À·ù" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" # -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "%s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù" # -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "%s¸¦ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "¾Ë ¼ö ¾ø´Â ÆÐÅÏ `%s'" # -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s¸¦ statÇÒ ¼ö ¾ø½À´Ï´Ù" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2695,10 +2752,6 @@ msgstr "" #~ msgid "WARNING: No volume header" #~ msgstr "°æ°í: º¼·ý Çì´õ ¾øÀ½" -# -#~ msgid "Archive %s EOF not on block boundary" -#~ msgstr "ºí·° °æ°è°¡ ¾Æ´Ñ ºÎºÐ¿¡¼­ ¾ÆÄ«À̺ê %sÀÇ EOF °ËÃâ" - # #~ msgid "Only read %d bytes from archive %s" #~ msgstr "%d ¹ÙÀÌÆ®¸¸ ¾ÆÄ«À̺ê %s¿¡¼­ Àоú½À´Ï´Ù" diff --git a/po/ky.gmo b/po/ky.gmo index 8405ae3d2d7670fa6b78459100698dcef3f4bb06..44ecf114f09247a0dbb625eb4a9b6c18bf9bd69c 100644 GIT binary patch delta 10498 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 delta 10757 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 diff --git a/po/ky.po b/po/ky.po index 863412f..d9e782d 100644 --- a/po/ky.po +++ b/po/ky.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.18\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2007-09-01 01:06+0100\n" "Last-Translator: Azilet Beishenaliev \n" "Language-Team: Kirghiz \n" @@ -86,7 +86,7 @@ msgstr " [ОПЦИЯ...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Толук маалымат үчүн `%s --help' же `%s --usage' деп жазгыла.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Каталарды бул жерге билдиргиле %s.\n" @@ -95,15 +95,15 @@ msgstr "Каталарды бул жерге билдиргиле %s.\n" msgid "Unknown system error" msgstr "Белгисиз система катасы" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "Бул жардам тизмесин көрсөтөт" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "Колдонуу жөнүндө кыска маалымат көрсөтөт" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "АТЫ" @@ -116,11 +116,11 @@ msgstr "Программага ат кой" msgid "SECS" msgstr "СЕК" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "СЕК секунда күтүңүз (алдынала - 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "программанын версиясын көрсөтөт" @@ -138,7 +138,7 @@ msgstr "%s: Аргументтердин саны көп\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(ПРОГРАММАДА КАТА) Опция билиниш керек болчу!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -198,16 +198,16 @@ msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' опциясы менен аргумент колдонулбайт\n" # Памятты эмне дейбиз яя? ;) -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "Память жетпей калды" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Учурдагы папка алмаштырылбайтат" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Учурдагы папка сакталбайтат" @@ -330,12 +330,24 @@ msgid "'" msgstr "“" # Ооба/ооба -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[оО]" # жок/Жок -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[жЖ]" @@ -537,100 +549,100 @@ msgstr "Файлдын соңу эрте келди" msgid "Garbage command" msgstr "Туура эмес команда" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Бул tar-архиви эмес окшойт" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Жазылган жалпы байт" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Алынган жалпы байт" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Өчүрүлгөн жалпы байт: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "record_size мааниси жарабайт" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Архивдин аты берилген жок" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Архивдин stdin/stdout текшерүүсү болбой жатат" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архив кысыштырылган абалда. %s опциясын колдонгула" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Кысыштырылган архивдерди жаңырталбай калды" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Лентанын башына келди, иш бүттү" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Өтө көп ката бар, иш бүттү" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "Архивде түз жайлашпаган блок бар (%lu байт)" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Маалыматтын көлөмү = %lu блок" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "Архивде түз жайлашпаган блок бар (%lu байт)" + +#: src/buffer.c:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Архивдеги файл өчпөй калды; архив ачылбаса -i деп колдонгула" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek маалыматтын чегинде токтогон жок" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: жараксыз том номери бар" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Томдун номери батпай калды" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "%2$s үчүн %1$d-томду даярдап Enter'ди басыңыз: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Колдонуучудан жооп күтүбатканда файлдын соңу келип калды" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ЭСКЕРТҮҮ: Архив толук эмес" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -641,70 +653,76 @@ msgstr "" " q\t\ttar программасынын ишин бүтүр\n" "y же Ввод\t\tИшти улант\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Команда строкасын ач\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Бул тизмени жаз\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Жаңы том жок; иш бүттү.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Файлдын аты берилген жок. Кайра жазып көргүлө.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Туура эмес ввод. Жардам үчүн ? жазгыла.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "%s командасы аткарылбай калды" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s бул томдо уланса керек: башкы-маалыматта аты кыскартылыптыр" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s мунун бул томдо уландысы жок" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s көлөмү туура эмес (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Бул том иретте эмес" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Архивдин тамгасы %s менен келишпей жатат" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "%s тому %s менен келишпей жатат" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: файлдын аты көп-томдук GNU башкы-маалымат үчүн өтө узун, кыскартылды" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek маалыматтын чегинде токтогон жок" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -715,8 +733,8 @@ msgstr[0] "%2$lu байттан %1$lu гана окулду" msgid "Contents differ" msgstr "Мазмундары окшобойт" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Архивде күтүлбөгөн жерде файлдын соңу бар" @@ -831,7 +849,7 @@ msgstr[0] "%s: Файл %s байтка азайды; нөлдөр менен т msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл башка файл-системасында; кошулбайт" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "астындагылар кошулган жок" @@ -860,7 +878,7 @@ msgstr "%s: файл архив экен; кошулбайт" msgid "%s: File removed before we read it" msgstr "%s: Файл окулганча өчүрүлүп кетти" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "папка кошулган жок" @@ -911,169 +929,169 @@ msgstr "%s: Папканын статусу билинелектен мурун msgid "Extracting contiguous files as regular files" msgstr "Удаа болгон файлдар жөнөкөй файл катары чыгарылып жатат" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Символикалык шилтемелерди түз шилтеме катары чыгарууга аракет кылынат" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "%s жактан окуп жатат\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Чыгарылган жок -- файл башка томдон уланып келиптир" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Башкы-маалымат узун" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: `%c' файл түрү бүлгисиз, жөнөкөй файл катары чыгарылды" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Азыркы %s жаңыраак же бирдей" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Бул файлдын резерв копиясы алыналбай калды" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "%s файлы %s деп алмаштыралбай калды" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Оңолбогон ката: иш бүттү " -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Папканын эски аты %s эле" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Папка алмаштырылды" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Папка жаңы" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Жараксыз убакыт тамгасы" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Алмашуу убагы туура эмес (секундалары)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Алмашуу убагы туура эмес (нано-секундалары)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Аспаптын номери жараксыз " -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Inode номери жараксыз" # фиелд, снэпшот дегендер кандай болот? -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Снэпшот файлды окубатканда ото узун поле чыкты" # snapshot? -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Снэпшот файлды окубатканда ката болду" # snapshot? -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Снэпшот файлда күтүлбөгөн жерде файлдын соңу (EOF) бар" # фиелд кандай болот? snapshot? -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Снэпшот файлда күтүлбөгөн поле(фиелд) бар" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Записьтерди бөлүүчү символ жок" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Файлдын форматы туура эмес" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Форматтын бул версиясы иштетиле албайт: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок %#3o келди" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Кошулуучу папка бузук: 'X' копиялары бар" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Кошулуучу папка бузук: 'R' менен берилген ат бош" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Кошулуучу папка бузук: 'T'дан мурун 'R' жок" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Кошулуучу папка бузук: 'T' менен берилген ат бош" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок датанын соңу келди" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Кошулуучу папка бузук: 'X' эч колдонулган жок" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s шаблонун колдонуп убактылуу жаңы папка ачылган жок" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Папка өчүрүлгөн жок: stat иштебей койду" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: бул папка башка аспапта жайгашкан: өчүрүлбөйт" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s өчүрүлүп жатат\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Өчүрүлбөй жатат" @@ -1093,19 +1111,19 @@ msgstr "блок %s: ** нөлдөр болгон блок **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Файлдын соңу **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1113,70 +1131,70 @@ msgstr "" "экилик системадагы терси алынды" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" "Архивдин сегиздик системадагы мааниси болгон %.*s %s диапазонунун тышында" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Архивде эски түрдөгү base-64 башкы-маалымат бар" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Архивдеги base-64 түрүндөгү %s сөзү %s диапазонунун тышында" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Архивдин %s мааниси %s түрүнүн %s..%s диапазонунда эмес" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " %s жака шилтеме\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " белгисиз файл түрү %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Узун шилтеме--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Узун ат--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Томдун башкы-маалыматы--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--%s-байттан баштап уланды--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Жаңы папка ачылыбатат:" @@ -1216,25 +1234,25 @@ msgstr "процесс-аралык канал" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Файлдын аттарында уйкаштарды издөө үчүн колдонулган тамгалар бар." -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" "Уйкаштарды издөө үчүн --wildcards опциясын колдонуңуз, же --no-wildcards" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "опциясы менен бул эскертүүнү көрсөтпөс кыл." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Архивде табылган жок" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Керектүү нерселер архивде табылган жок" @@ -1261,7 +1279,7 @@ msgstr "" "Ковычкалардын түрү белгисиз - `%s'. Тизмени көрүүгө `%s --quoting-" "style=help' жазгыла." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1283,7 +1301,7 @@ msgstr "" " tar -xf archive.tar # Аты archive.tar болгон архивдин ичиндеги " "баардык файлдарды чыгарат.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1305,89 +1323,89 @@ msgstr "" "жөнөкөй вариант\n" " never, simple ар дайым жөнөкөй резерв копиялар сакталат\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Негизги иштөө абалы:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "архивдин ичиндеги файлдарды тизмелейт" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "архивден файлдарды чыгарат" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "жаңы архив жаратат" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "архив менен файл система айырмаларын табат" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "файлдарды архивдин аягына кошот" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "архивдин ичиндегилерден жаңы болгон файлдарды гана кошот" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "tar файлын архивге кошот" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "архивден өчүрөт (магниттик ленталарда жарабайт!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "архивдик томдун атын текшерет анан бүтүрөт" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Иштөөнүн модификаторлору:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "кеңири жайлашкан файлдарды эфектүү түрдө колго ал" # major, minor -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "БАШКЫ[.КИЙИНКИ]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "кеңири жайлаштыруу форматынын версиясын тандайт (--sparce опциясы кошулган " "болот)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "эски GNU форматындагы резервдөө методун колго ал" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "жаңы GNU форматындагы резервдөө методун колго ал" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "окулбаган файлдар келгенде нөл болбогон статус менен ишти бүтүрбө" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1399,119 +1417,119 @@ msgstr "" "файлдардын аттары команда строкасында же -T опциясы менен берилгенде гана " "жарактуу болот. N-дин мааниси алдынала 1ге барабар." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "Архивдин ичиндегилерди издесе болот" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "үстүнө көчүрүү контролу:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "архивди сактагандан кийин текшерүүгө аракет кылат" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "файлдарды архивге кошулгандан кийин өчүрөт" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "файлдарды чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрбө" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "мурун бар болгон файл архивдеги копиясындан жаңы болсо аны алмаштырба" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрөт" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "бар болгон файлдын ордуна көчүрүүдөн мурун ал файлды өчүрөт" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "папканы чыгарардан мурун баардык иерархияларды өчүрөт" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "мурун бар болгон папкалардын мета-касиеттерин корго" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "чыгаруу учурунда бар болгон папкалардын мета-даталардын үстүнө жазылат " "(алдынала тандалат)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Чыгаруу() жолун танда:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "файлдарды стандарт чыгарууга (output) жөнөт" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" "архивден чыккан файлдарды канал(pipe) жолу менен башка программага жөнөтөт" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "туулган процесстердин бүтүрүү кодторуна караба" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "туулган процесстердин нөл болбогон бүтүрүү кодторун ката деп ишке ал" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Файлдын өзгөчөлүктөрүн колго алууда:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "кошулган файлдардын ээсин АТЫ деп кой" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "кошулган файлдардын группасын АТЫ деп кой" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "ДАТА-ЖЕ-ФАЙЛ" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "кошулган файлдардын алмашуу убактысын ДАТА-ЖЕ-ФАЙЛ дан ал" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "УКУК" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "кошулган файлдардын укук абалын УКУК деп кой" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1521,28 +1539,28 @@ msgstr "" "сакта (МЕТОД='replace'; алдынала тандалат) же колдонуу убакыттарын " "алмашырбай туруп сактап кал (МЕТОД='system')" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "файлдын алмаштыруу убактын чыгарбайт" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "ээсин ошол бойдон калтырып файлдарды чыгарууга аракет кылат" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "файлдарды өзүңдүкү катары чыгарат" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "ээси/группа аттарын ардайым номерлер менен көрсөтөт" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "файлдын уруксат маалыматын да чыгар (суперколдонуучуга алдынала тандалат)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1550,15 +1568,15 @@ msgstr "" "архивден уруксат маалыматын чыгарыбатканда колдонуучунун umask'ын колдон " "(жөн колдонуучуларга алдынала тандлат)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "чыгатурган файлдарды архивдегидей кылып сортто" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "-p жана -s менен бирдей" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1566,141 +1584,141 @@ msgstr "" "чыгарылган папкалардын колдонуу убакыттарын жана уруксаттарын чыгаруу иши " "бүткөндөн кийин коёт" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore опциясынын эффектин токтотот" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Аспапты тандоо жана ага өтүү:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "АРХИВ" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "АРХИВ деген архивдик файлды же аспапты колдонот" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "архивдик файлда эки точка болушуна карабастан ал локалдуу" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "rmt'нин ордуна КОМАНДА колдонулат" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "rsh'тын ордуна КОМАНДА колдонулат" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "драйв жана анын тыгыздыгын белгиле" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "көп томдуу архивди жарат/тизмеле/чыгар" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "N x 1024 байт жазгандан кийин лентаны алмаштыр" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "ар лентанын аягында скриптти иштет (-M опциясы колдонулат)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "ФАЙЛ файлынын ичиндеги том номерин колдон/жаңырт" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Аспаптын блоктолушу:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "БЛОК" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "ар маалыматка БЛОК x 512 байт түшөт" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "Ар маалыматка N байт түшөт, 512 көбөйтүндүсү" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "архивдеги нөлдүү блокторду өтүп кетет (EOF жөнүндө)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "окубатканда кайрадан блокторго бөлүп чык (4.2BSD каналдары үчүн)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Архивдин форматын тандоо:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "тандалган форматта архив жаратат" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "ФОРМАТ булардан бирөө болот:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "эски V7 tar форматы" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 версиясында болгондой GNU форматы" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x форматы" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) форматы" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) форматы" # pax деген gid,atime сияктуу нерселер -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "pax менен бирдей" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "--format=v7 менен бирдей" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "--format=posix менен бирдей" # keyword эмне болот? -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ачкыч-сөз[[:]=мааниси][,ачкыч-сөз[[:]=мааниси]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "контролдоо үчүн pax ачкыч сөздөрү" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1708,87 +1726,100 @@ msgstr "" "том аты ТЕКСТ болгон архив жарат; тизмелөө/чыгаруу учурунда, ТЕКСТ дегенди " "том атынын глоб шаблону катары колдон" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Бирбирине келишпеген кысыштыруу опциялары берилди" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "архивди bzip2 менен ишке ал" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "архивди gzip менен ишке ал" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "архивди compress менен ишке ал" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "архивди gzip менен ишке ал" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "архивди gzip менен ишке ал" + +#: src/tar.c:613 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "ПРОГ менен ишке ал (-d опциясы болушу керек)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Локалдуу файлдарды тандоо:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "ФАЙЛды архивге кош (файлдын аты тире менен баштаган учурда пайдалуу)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "ПАПКА" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "ПАПКА папкасына өт" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "чыгарылатурган же жаңы ачылатурган файлдарды АТЫ деген файлдан кара" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T опциясы нөл менен бүткөн аттарды окуйт, -C опциясы өчүрүлөт" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" "-T менен алынган файлдардын аттарындагы ковычкалар өчүрүлөт (алдынала " "тандалат)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "-T менен алынган файлдардын аттарындагы ковычкалар калаберет" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "ШАБЛОН" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "ШАБЛОН менен уйкаш файлдар ишке алынбайт" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "ФАЙЛда тизмеленген шаблондор менен уйкаш файлдар ишке алынбайт" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1796,92 +1827,92 @@ msgstr "" "CACHEDIR.TAG файлы болгон папкалардын астындагылары тэг файлдан тышкарысы " "кошулбайт" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG файлы болгон папкалардын астындагыларынын баары кошулбайт" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG файлы болгон папкалар кошулбайт" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "ФАЙЛ файлы болгон папкалардын астындагылары ФАЙЛ файлындан тышкарысы " "кошулбайт" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "ФАЙЛ файлы болгон папкалардын астындагыларынын баары кошулбайт" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "ФАЙЛ файлы болгон папкалар кошулбайт" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "папкалардын тереңине кирип кетүүнү токтот" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "архивди жасабатканда локалдуу файл системасында кал" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "папкалардын тереңине кирет (алдынала тандалган)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "файл аттарынын башындагы '/'терди өчүрбө" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "символикалык шилтемелерге барат; алар көрсөткөн файлдарды архивге кошот" -#: src/tar.c:658 +#: src/tar.c:667 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "" "символикалык шилтемелерге барат; алар көрсөткөн файлдарды архивге кошот" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "МҮЧӨНҮН-АТЫ" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "архивдеги МҮЧӨНҮН-АТЫ мүчөсүнөн башта" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "ДАТА-ЖЕ-ФАЙЛ'дан жаңы болгон файлдарды гана сакта" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "датасы алмашканда гана дата жана убактысын салыштыр" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "өчүрөрдөн мурун копиясын сактап кал, CONTROL версиясын танда" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "STRING" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1889,93 +1920,93 @@ msgstr "" "өчүрөрдөн мурун копиясын сактап калат, жалпы колдонулган суфикс кошулат (бул " "суфикс SIMPLE_BACKUP_SUFFIX жолу менен алмаштырылбаган болсо '~' болот)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Файлдын атынын алмашуулары:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "чыгаруу учурунда файл аттарынын башындагы N компонентти алып салат" # выражение кыргызча кандай? СҮЙЛӨМ башка жерде да бар -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "СҮЙЛӨМ" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "файлдардын аттарын алмаштыруу үчүн sed replace EXPRESSION колдонгула" # inclusion, exclusion - Kyrgyz equiv? -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Файлдын атына уйкаштыруу опциялары (бардык шаблондорго тиешелүү):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "тамгалардын чоң-кичинесине каралбайт" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "шаблондор файлдын атынын башталышы менен уйкаштырылат" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" "шаблондор `/' символунан кийин келген ар жерде уйкашына каралат (алдынала " "тандалган)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "уйкаштырууда тамгалардын чоң-кичинесине каралат (алдынала тандалган)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "шаблондор колдонулат (иштен алынбаган файлдарга алдынала тандалат)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "кандай жазылса ошондой колдонулат" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "шаблондор `/' символун издебейт" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "шаблондор `/' символун издейт (алдынала тандалган)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Маалыматтандыруу:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "ишке алынган файлдарды кеңири маалыматы менен тизмеле" # Ушу 'record' сөзүнө жакшы котормо табалбай койдум # 'маалымат' деп жазыбаттым эле, бул жерде келишпей калаткен -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "ар N записьтен кийин маалымат берип турат (алдынала 10 болот)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "баардык шилтемелер кошулбай калса билдирүү жазып чыгар" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1987,27 +2018,27 @@ msgstr "" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 жана SIGUSR2; SIG префикси жазылбаган " "аттарын да колдонсо болот." -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "файлды алмаштыруу датасын UTC түрүндө көрсөт" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "чыккан кеңири маалыматты ФАЙЛ файлына жибер" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "ар билдирүүдө архивдин ичиндеги блок номерин көрсөт" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "ар ишти аткарууга макулдук сурап тур" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "tar'да алдынала коюлган опцияларды көрсөтөт" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2015,33 +2046,33 @@ msgstr "" "тизмелөө же чыгаруу учурунда издөө критериясына жатпаган папкаларды да " "тизмелейт" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "алмаштыруудан кийин файлдын же архивдин аттарын көрсөтөт" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "аттарга ковычка кошуу стилин тандаңыз; жарактуу СТИЛЬ түрдөрү төмөндө " "көрсөтүлөт." -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "STRING ичинде болгон тамгаларга кошумча ковычка кошот" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "STRING ичинде болгон тамгаларга ковычка кошпойт" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Келишүү опциялары:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2049,56 +2080,56 @@ msgstr "" "жаңы архив жасабатканда --old-archive менен бирдей; чыгарыбатканда --no-same-" "owner менен бирдей" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Башка опциялар:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "зыяндуу көрүнгөн опцияларды колдонууга тыюуу салат" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' опцияларынан бирөөнү гана колдоно аласыңар" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Бирбирине келишпеген кысыштыруу опциялары берилди" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Сигналдын аты белгисиз: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Датанын шаблон файлы табылган жок" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Белгисиз %1$s дата форматынын ордуна %2$s коюлат" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "%s опциясы: `%s' датасын %s деп алды" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: файл тизмеси окулган" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: алынган файлдын атында бош тамгалар бар" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style опциясы үчүн мындай аргументтер бар:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2106,150 +2137,164 @@ msgstr "" "\n" "*Бул* tar алдынала мындай иштетилет:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Блок көлөмү жараксыз" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Эскертүү: -I опциясы иштетилбейт; балким -j же -T дегиңиз келди эле?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Лентанын узундугу жараксыз" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Бирден көп ченемдөөчү дата бар" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "кеңири жайлаштыруу форматынын версиясы жарактуу эмес" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "Бул платформада --atime-preserve='system' опциясы иштебейт" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "--checkpoint опциясына жазылган аргумент сан эмес" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Жараксыз группа" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Опцияда жарабаган укук абалы берилди" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Жарабаган номер" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Ээси жарабайт" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Маалымат көлөмү жарабайт" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Маалыматтын көлөмү %d көбөйтүндүсү болушу керек." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Элементтердин саны жарабайт" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "--to-command опциясы бир эле жолу жазылыш керек" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Тыгыздык аргументи туура эмес: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Түшүнүксүз тыгыздык: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "*Бул* tar `-[0-7][lmh]' опцияларын иштетпейт" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Эски болгон `%c' опциясына параметр керек." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "Файл тизмеси болбосо --occurrence дегендин мааниси болбойт" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "Колдонулган иштетүү абалда --occurrence колдонулбайт" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Бир нече архив файлы болсо `-M' опциясы колдонулушу керек" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental менен --newer чогу колдонулбайт" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Көп-томдуу архивдерди текшералбай калды" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Кысыштырылган архивдерди текшералбай калды" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Көп-томдуу кысыштырылган архивдерди колдоналбай калды" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Кысыштырылган архивдер кошулалбайт" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option POSIX архивдеринде гана колдонула алат" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Бош архив жаратуудан уялып баш тартып жатат" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "`-Aru' опциялары `-f -' менен келишпейт" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "`-Acdtrux' опцияларынан бирөөнү тандап колдонуңуз" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Ката үчүн ишти бүтүрүү, мурунку каталардан улам кеч аткарылды" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2257,83 +2302,83 @@ msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Файл %s байтка азайды" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "%s сөзү белигсиз же азырынча киргизилген эмес" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "%s шаблону колдонулбайт" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "%s ачкыч сөзү алмаштырылбайт" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Кеңейтилген башкы-маалымат бузук: узундук жок" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Кеңейтилген башкы-маалыматтын узундугу жарактуу маанилердин тышында" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "Кеңейтилген башкы-маалыматтын узундугу - %*s - диапазондун тышында" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" "Кеңейтилген башкы-маалымат бузук: узундуктан кийин бош жер (пробел) жок" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Кеңейтилген башкы-маалымат бузук: барабар символу жок" # newline эмне болот? -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Кеңейтилген башкы-маалымат бузук: жаңы сап жок" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Кеңейтилген башкы-маалыматта белгисиз `%s' сөзү каралбайт" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "%s=%s түрүндөгү кеңейтилген башкы-маалымат %s..%s диапазондун тышында" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Кеңейтилген башкы-маалымат бузук: %s=%s туура эмес" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Кеңейтилген башкы-маалымат бузук: %s=%s ашыкча көп" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Кеңейтилген башкы-маалымат бузук: туура эмес %s: күтүлбөгөн жерде бул - %c - " "бөлүүчү символ бар" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Кеңейтилген башкы-маалымат бузук: туура эмес %s: так санда маани бар" @@ -2507,105 +2552,122 @@ msgstr "Сан жарактуу маанилердин тышында: %s" msgid "Negative size: %s" msgstr "Көлөмү терс сан: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) аткарылбай калды" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "`%s' жанындагы санды окубатканда ката чыкты" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Датанын форматы түшүнүксүз" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[АРГУМЕНТТЕР...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "`%s' ачылбай жатат" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "издөө болбой калды" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "файлдын атында бош тамга бар" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "кеңири(чоң) файлдарды стандарт чыгарууга жибералбайт, --file опциясын " "колдонуңуз" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "туура эмес маска (`%s' жанында)" # фиелд деген кандай болот? -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Белгисиз поле `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "`%s'ке убакыт аталган жок" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Команда толук аткарылды\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Команда %d статусу менен аткарылбай калды\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Команда %d сигналы менен жабылды\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Команда %d сигналы менен токтотулду\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Команда core dump менен бүттү\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Команда жабылды\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat опциясы менен файл аттары жазылыш керек" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "аргументтердин саны көп" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "--delay-directory-restore опциясынын эффектин токтотот" + #~ msgid "block size" #~ msgstr "бир блоктун көлөмү" #~ msgid "[.]NUMBER" #~ msgstr "[.]N" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Ката үчүн ишти бүтүрүү, мурунку каталардан улам кеч аткарылды" diff --git a/po/ms.gmo b/po/ms.gmo index 96df7b556a00a9f18a2174336f4293d750acc732..bb798e84958a2d904660a58d03dcc164fc40f998 100644 GIT binary patch delta 2963 zcmX}ue@vBC9LMo<`Jr4cKQ+9fs25NWf%pw_QBgqqC5bIwk0BL+K{sh>jp*F5+ki2g-=cm@vGB)9^kfU^o}&VkU;;der^(n1QW02M4eS zzrz_AM&oEqMz=ARDWnp^h1D2^+i*4>z=!Z%^x_AofqzGJ5E^03bd1An%)>-%Kuxp@ z)lV<#zE5p`LyZ#>soyPQVyR?tVIiu6=P({$!&n@!y^3j^-^5uMO)v8>19g2prehm= zZ~&9=8cxB#Q5kVDdzp$3#y3w;nS|x20oS2!*nuf{1oN;Tb>k4GqJu^&FdcKS85iIg z)D!=Jy6-+_V%pU4CEA2bI6sJ%I{b)=8eGSj7)svtgh{AOl%WRPYM;M_%G5d3KtH4U z8AFm|X0o2jNGj5$sX`AnB7dfvgZk}_A^%F@WiIH3JIKSC=`5f+T7YWkMfRPkK{kzP zKy}oLjA`CMZN7eFdzdd#1OI4y8%cus7yU~|C#;6aaFhQqDoeSb4$D!Ss@`sJ2sOcO zREB)0Ox(mQjH0pbD?z2c3N_Jo)P1ibP0e}K1inFKco6wB4=j$FKnx47h6$*Syr>Lp zL3Okj`7`fx(55<%8t51M`Uol$0lZ_c(aE^*U6F52M!nIBLLtqzm&2Dz!IIdt}u9J&I0)IiH8x?5W88mdU1~)ULq> zX3&lrV3dWTYW_iOGB>l(2gi#VpcXZOU8pB{!~XqqT*&z?^k4#wv=>TI?JGHuEVCaY z_5Qy}g+FtOgMPS#MR)_}quVq7L0O7CjH$#zY(njYv#7Paj+)>-)FyMskH5Zos0q}f zma+*o!IS#kqVhczt@#5~N69>{23m@`UW4ke6KP^j+tGH5^2B_!kynJddLcRHHUs8rrcdLUk+eTDIPN3eFi>N343H7DC zW1q(`Yh@w@dF9PY)PvM>$i*(yroS|w{Oi5^lMC8(f%KvYMWbG?EYz-Ej9Qv1)cd|0 zJ=lr*V4Xo_@B(VUZ|(D8^l(0g+O%=ZUj3${9-z>oq5)Q;I&MVGybZMpPa_XyhEQ*b zll4(MFQ#J!s>2r4eaBFHjsw)?6y;xD@rlX-2JO2WoHh zp;C7RUHAw3JFFe-!oBT*V9wBL8eg%j8l~%JR{P<*1BQ z+U`LO+>L5?5|!!!`}fPJ)D9wl<}L?4xrb4LF&`)4BGl5Bq8_*&9h%}6PE_`eV>Y82 ztm#Q{CTBfEZ3$6HOq56}D~T#X&!n=C(25@IIpTE3?xGez6cft{9@@VwdwM=}&aqzR zOgUXlsH`W}5p2f)O9eIMv7UH@s3ugDg2RN?M&&W$5b+XGO0d5E#{~bo*{BL-?KtKb z59VL6ATHz(PZ8P)D%xp!KN<)vrpl9q@~KizwD@b|YqgR3abj!FsnA4g6}24%d)>bm zwQ5~N1Tj&LP>L`)`Fb<<3=5i0u$ZIc3>Q26wjI^t;}oOqN_SxsmJeQsKN&bkugJE%QN z>?AxyK2b}kyg+R0x$Bzh*zF4r8+Q7pPP-Q93!Je$Fd{2EJ-fh@nd!~VP0h^qZJ5>T P@+GCXgM1s)?*#k@6~h!? delta 3127 zcmXxkeNa?Y7{~F0g1UlAD5!yO2}R^ZK{UfR3Qa9vP)U>2bY<6ASwNS)f~KtR;w$Cq zl$A4@l}={kv@==FWHy>(Z#h+0Q=)~?1nb#{q;Bm_hSZLz)|=I zK8X1=egG$8Z(~BHl1ef+mSG}p#&mocd*N{$iC>}y?%ch-gIw&x^=KT5voH%=P!oLz z)z2x^d%rlw^=Ka_2h$nflu#+6!5mZvTQL*g#lCpK@doB|9m_2HVG$0%a@2hr3-EQc z@B(JzpO}Pw_-th)&v7!wFutjw(g|x(0|rqq?8HHM0EgpwR0lCU%)?BafK#y;cVjM| zMSbyY)O#sCjVZ(_s3lsBWAPOXsl%U~2LECz*SX|fUpN7k2@h((P0saus7!r_8t4wH zpH$Y7B$-jDj7&zlG)-vXcI3|-<)8XJl}!EzQfcFcQrV4#(~HH($C`zx4g;tc)?qxp zfovXg4AtRTWDe#E>I-ip+r=c(NE1kR9Ev2xOhA2LWpDD&@|Z?$Bw!1w!#$|Ybp-YN zG-`t1qf&Vnm63cJ72zDzds|UUupc$i^QiYOA+MPKP!mXIot5dF5Ebs3@u&&RM>Sl6 z>S!G*14mIEeT>@GzaoF817}K`EDbf_IMn@eR7QM`&DfdiFlyjeQT>FDQyEX?2Q0=^ zo({%xjKOA9O4ndl+=qJcuyg-&RI0C{_P}4Lfs=TNF3mtx2Fp-;rULc65#x0Jw^PyX z--YU6FDk_!Vl^|kff}HKQK=d?YST5Net-_31~`Ly{}Sp${&Ak?aq|(br=x{iPNkUqemc3=RlUxlBbf)Mu$d32N=DP#x_=4Rpx4e+t#%E#y^`Kwi~;FlqvoXyHbr ziFpe(;5k(LpB?XED25xEOjApcg-UTQYKlEwR92W&wP!2@4 zL2bqoR3>cHY1xNr_ca#aRgA|ZzE1C@qxQ^WsCElbn?7Vy(dKH!1U!PA9PhGxY{2VG1*RTuTK@A*3nrRm@sZ_KXMxc(-Djb6E zqc-O?RO+sy3-6&a<%^u>ji?OoLS8ioQ5pCKMyQ1=<#Y^T6SIj~#9HEhnL$N)^biw?X9yLgfK44;8(lv^G!v_d zaRmD!`jrsf`L(K0o@&Qz=hQ?OES4L^#9TrfLPa}H$HYfyF;&V5fY^vW*x`bS8!n%ZUwy$_gTm7@-RaznNw#v4H4COd?cf z5;cT=e%6I|#Aju0qUI%*5*G0=v5-)yBdWs}<9o&gB5m>4T$$b`U(oV+{q7ZBkF_{Z zUu!K5c$fR??FP#m2-F7}BBzso?3h;VYp|Br`|Vn\n" "Language-Team: Malay \n" @@ -80,7 +80,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Cuba '%s --help' untuk maklumat lanjut.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -91,15 +91,15 @@ msgstr "" msgid "Unknown system error" msgstr "Ralat sistem tidak diketahui" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -112,11 +112,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -134,7 +134,7 @@ msgstr "%s: opsyen `%s' memerlukan hujah\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -193,16 +193,16 @@ msgstr "%s: opsyen `-W %s' adalah kabur\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opsyen `-W %s' tidak mengizinkan hujah\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "memori keletihan" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Tak dapat tukar direktori kerja" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Tak dapat simpan direktori kerja" @@ -323,11 +323,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -529,105 +541,105 @@ msgstr "Akhir fail tak matang" msgid "Garbage command" msgstr "Arahan sampah" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Ia nampaknya bukan seperti arkib tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Jumlah byte ditulis: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Jumlah byte ditulis: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(paip)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Nilai tidak sah bagi record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Tiada nama arkib diberi" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Tak dapat menentusahkan arkib stdin/stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Tak dapat mengemaskini arkib termampat" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Pada permulaan pita, keluar sekarang" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Terlalu banyak ralat, keluar" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: mengandungi nombor volum yg tidak sah" -#: src/buffer.c:894 +#: src/buffer.c:914 #, fuzzy msgid "Volume number overflow" msgstr "Nombor volum melimpah" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF dimana maklumbalas pengguna dijangka" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "AMARAN: Arkib tidak lengkap" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -639,69 +651,74 @@ msgstr "" " ! Spawn subshell\n" " ? Cetak senarai ini\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Tiada volum baru; keluar.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "Arahan '%s' gagal" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s tidak bersambung pada volum ini" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s adalah salah saiz (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Volum ini tidak dalam turutan" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkib tidak dilabelkan supaya memadan %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Volum %s tidak sepadan %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -713,8 +730,8 @@ msgstr[1] "Hanya boleh membaca %lu drpd %lu byte" msgid "Contents differ" msgstr "Kandungan berlainan" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "EOF tanpa diduga pada arkib" @@ -831,7 +848,7 @@ msgstr[1] "%s: Fail mengucup sebanyak %s byte; pad dengan sifar" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -860,7 +877,7 @@ msgstr "%s: fail adalah arkib; tidak dilonggokkan" msgid "%s: File removed before we read it" msgstr "%s: Fail dibuang sebelum kami membacanya" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -911,168 +928,168 @@ msgstr "%s: Direktori ditukarnama sebelum statusnya boleh diekstrak" msgid "Extracting contiguous files as regular files" msgstr "Mengekstrak fail bersambung sebagai fail biasa" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Cuba mengekstrak pautan simbolik sebagai pautan keras" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Membaca %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Tak dapat ekstrak -- fail bersambung dari volum lain" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Penghujungan tanpa diduga data imej PNM" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Jenis fail tak dikenali '%c', diekstrak sebagai fail biasa" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tak dapat backup fail ini" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Tak dapat menukarnama ke %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Ralat adalah tidak boleh dipulihkan: keluar sekarang" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktori telah ditukarnama" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah ditukarnama" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktori adalah baru" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Setem masa tidak sah" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Mod tidak sah diberi pada opsyen" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Nombor peranti tidak sah" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Nombot inod tidak sah" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF tanpa diduga pada arkib" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Tak dapat memperuntukkan memori bagi faktor pemblokan %d" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Memadam %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: tak dapat buang" @@ -1092,86 +1109,86 @@ msgstr "blok %s: ** Blok TIADA **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Akhir Fail **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Nilai oktal arkib %.*s diluar julat %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr "Pautan ke %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr "jenis fail tak diketahui %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Pengepala Volum--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Bersambung pada byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Mencipta direktori:" @@ -1208,24 +1225,24 @@ msgstr "saluran antaraproses" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Tak dijumpai pada arkib" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Tak dijumpai pada arkib" @@ -1250,7 +1267,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1270,7 +1287,7 @@ msgstr "" "verbose.\n" " %s -xf arkib.tar # Ekstrak semua fail drpd arkib.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1282,87 +1299,87 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "EOF tanpa diduga pada arkib" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1370,559 +1387,572 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Ralat ketika menulis ke output piawai" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Tak dapat menentusah arkib multi-volume" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "opsyen format arkib konflik" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Opsyen mampatan konflik" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: fail adalah arkib; tidak dilonggokkan" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Tak dapat tukar direktori kerja" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Membuang awalan `%.*s' drpd nama ahli" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "Volum %s tidak sepadan %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1930,267 +1960,281 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Anda tak boleh nyatakan lebih drpd satu opsyen `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Opsyen mampatan konflik" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "jenis fail tak diketahui %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Fail tarikh tidak dijumpai" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Mengganti %s bagi format tarikh tak diketahui %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Faktor pemblokan tidak sah" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Amaran: opsyen -I tidak disokong; mungkin and amaksudkan -j atau -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "panjang pita tidak sah" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Kumpulan tidak sah" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Mod tidak sah diberi pada opsyen" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Nombot inod tidak sah" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Pemilik tidak sah" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Saiz rekod tidak sah" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Saiz rekod mesti dalam gandaan %d." -#: src/tar.c:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "panjang pita tidak sah" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "OPsyen lama `%c' memerlukan hujah." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Fail akrib beraneka memerlukan opsyen `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Tak boleh gabung --listed-incremental dengan --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Tak dapat menentusah arkib multi-volume" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Tak dapat menentusahkan arkib termampat" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Tak dapat menggunakan arkib multi-volume termampat" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Tak dapat mengemaskini arkib termampat" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Secara dayus enggan mencipta arkib kosong" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opsyen `-Aru' tak serasi dengan `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Anda mesti nyatakan satu drpd opsyen `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Ralat keluar dilewatkan drpd ralat terdahulu" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2199,79 +2243,79 @@ 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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2434,97 +2478,107 @@ msgstr "Nombor inod diluar julat" msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Ralat sistem tidak diketahui" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Tak dapat tutup" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "jenis fail tak diketahui %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Tak dapat rayau ke %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Anak mati dengan isyarat %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "Nama fail modul" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2707,6 +2761,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Ditulis oleh John Gilmore dan Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Ralat keluar dilewatkan drpd ralat terdahulu" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/nb.gmo b/po/nb.gmo index fc9ab2c610f29cf177541bdffc9db26c3547ebf3..8850d28a8b6f0a73ee371ffebb49fcd0d4e060b7 100644 GIT binary patch delta 1340 zcmXxkPe_zO7{~GFU3YCW+f}#LGS^n^kFKq)>-sl67$g`(l&1nAs17M1U5cVuDD2=Z zmZDP~DlF^vW<-~iF0l|q1`(;?Ns1sSh$s(zf3L5D<7ejGd1vN%W_G7jKb!JPRl(av z>7&+CR~@rqTqxlmr72`qj?LJBomhb$*n*G!{zufrzflX@!wGM zSCpAmV*;bBZyhu=;1F)dG2DX_s0p6=&tKve`X7+sYz6D^2exB`!L4`@m8lD;4BkS$ zH-nsp6_KRcd(5BWyg$*{%!6+JDb<6hl$}Fu=rU?U1yqEuFoNIx=l`&aeghBn{z=qP zT*D;ZN4-CbJ-C8Iq1DU%;7llXAk*D zEH;BRIEM*bKpo*SCW54*v$i7isPu;JC54nb<{%Bn8HOI#4v+&`HmvT zYNt^fJC6*p0&3w$sJrk66~JfIdaI~_<9TM$j{8wN9zs5|GpL-7MxF6lEX6T&P-C?*Z6Zlk>85t<_nK=j`%MpBFtX)MuHOc2LPgOw7LEj~ z^SXLU>U!Bl;{Y{C<*VX-CzQips$x}GI$V`js(uypeNbN4i$dmdcsWX=LeK%JKl`rcJ-Q-hMFHdAX0PAHbn(b9!eQI`#g5h`47zYazOw9 delta 1521 zcmXxkO>B%o9LMq5wpyyF*1IiJFRfzP)i-U`sgZK%!Am1VD4ng<-7dS&7Kdiz=B;sP z9Go1AghV1;7Z*uga3JF3RP}Na7edl_X?%aru1V+l%*@U+Gyj=+`hC-b&Dp7{lADIK zn;axp6d7{>{}l5ebc?;^j$k!DK#NaN4#v#lQtGScYpCaNCBDTv{EAw6H4n9~#UWoL(~G_peCM1E$A02(%OZ_@MjM2 zQ2R-2#Ve@yCs9Z987-DFnEKT(V*lGH^w6L)yNo)kM}-cbP?x2g{nh|=xEQ-p10O+c z=?FI9IO_dZ*o5j#(KI7Ln?1M+_oI$Hv6%hWExtwr!I(S9tuzy;NMEA9ichFpt%nv` zjhd(fH{%fQ!CRk`^1$8$LW+^C=GpH>YMNRy;P=AeD`A^i! z0~{P0Oh*@>yHCT#=)>8;j(DrGCx*!@*shu40 zOZj667s^5xPFriq`rn}-6o8`MFcvCVp4GGp<$uz$I>{wuJ}Lhr))IG-wWoeqsI;A| z8^lHQzbWvOLgo_rp=?8)oi0!@S&1*i4=se`Pf zUEWD%qx_u#|0=LQ{!y>V)y|nLs!OGkDeEr8JlpT$eHUH7ji!2#wP|-Q)>#Y26=>3GH)iVY3eDD!%;{&;M_rJVn3uA`C#bve&-g=suHm`o&G%4TTl U8@4GoIOw7?@d20nU3EV24_EiA2><{9 diff --git a/po/nb.po b/po/nb.po index b20c991..3352f1d 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.12\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 1997-06-05 19:39 MET DST\n" "Last-Translator: Espen Skjelnes Johnsen \n" "Language-Team: Norwegian-bokmål \n" @@ -80,7 +80,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Tast «%s --help» for mer informasjon.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -89,15 +89,15 @@ msgstr "" msgid "Unknown system error" msgstr "Unkjent systemfeil" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -132,7 +132,7 @@ msgstr "" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -191,17 +191,17 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "Gammelt flagg «%c» behøver et argument." -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 #, fuzzy msgid "memory exhausted" msgstr "Minne oppbrukt" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Kunne ikke finne navnet på aktiv filkatalog" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -322,11 +322,23 @@ msgstr "" msgid "'" msgstr "" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -522,110 +534,110 @@ msgstr "For tidlig filslutt" msgid "Garbage command" msgstr "Ugyldig kommando" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Dette ser ikke ut som et tar-arkiv" # -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Totalt antall bytes skrevet: " # -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 #, fuzzy msgid "Total bytes read" msgstr "Totalt antall bytes skrevet: " # -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Totalt antall bytes skrevet: " -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Ugyldig verdi for record_size" # -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Arkivnavn er ikke oppgitt" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Kan ikke verifisere stdin/stdout-arkiv" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" # -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Kan ikke oppdatere komprimerte arkiver" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "På begynnelsen av båndet, avslutter nå" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "For mange feil, avslutter" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "" -msgstr[1] "" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "" +msgstr[1] "" + +#: src/buffer.c:793 #, 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF der svar fra bruker var forventet" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ADVARSEL: Arkivet er ufullstendig" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -637,69 +649,75 @@ msgstr "" " ! Start et shell\n" " ? Skriv denne listen\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Ikke nytt volum; avslutter.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsetter ikke i dette volumet" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, fuzzy, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har feil størrelse (%ld != %ld + %ld)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dette volumet kommer ute av rekkefølge" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, fuzzy, c-format msgid "Archive not labeled to match %s" msgstr "Arkivet er ikke navngitt for å passe med «%s»" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "Volumet «%s» stemmer ikke overens med «%s»" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "Arkiv %s sluttet ikke ved en blokkgrense" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -712,8 +730,8 @@ msgstr[1] "Kunne bare lese %d av %ld bytes" msgid "Contents differ" msgstr "Modus er ulik" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Uventet filslutt i arkivet" @@ -832,7 +850,7 @@ msgstr[1] "Filen %s krympet med %d bytes, fyller ut med nuller" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: På et annet filesystem. Ikke lagret" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 #, fuzzy msgid "contents not dumped" msgstr " (minnet lagret)" @@ -862,7 +880,7 @@ msgstr "%s er arkivet; ikke lagret" msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -913,170 +931,170 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "Ekstraherer sammenhengende filer som vanlige filer" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Forsøker å ekstrahere symbolske linker som harde linker" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Leser %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, fuzzy, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "Kan ikke ekstrahere «%s» -- filen fortsetter fra et tidligere volum" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Uventet filslutt i arkivfilen" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "Ukjent filtype «%c» for %s, ekstrahert som en vanlig fil" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Kunne ikke lage sikkerhetskopi av denne filen" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Kan ikke endre navn på %s til %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "Filkatalogen %s har endret navn" -#: src/incremen.c:400 +#: src/incremen.c:457 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "Filkatalogen %s har endret navn" -#: src/incremen.c:441 +#: src/incremen.c:502 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "Filkatalogen %s er ny" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Ugyldig modus gitt i flagg" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 #, fuzzy msgid "Read error in snapshot file" msgstr "Lesefeil på %s" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutt i arkivfilen" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Uventet filslutt i arkivfilen" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan ikke gå til filkatalogen %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" @@ -1096,86 +1114,86 @@ msgstr "blokk %10ld: ** Blokk med NUL-er **\n" msgid "block %s: ** End of File **\n" msgstr "blokk %10ld: ** Slutt på fil **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, fuzzy, c-format msgid "block %s: " msgstr "blokk %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " link til %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " ukjent filtype «%c»\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Volumhode--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsetter ved byte %ld--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Lager filkatalog:" @@ -1214,24 +1232,24 @@ msgstr "" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Finnes ikke i arkivet" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Finnes ikke i arkivet" @@ -1256,7 +1274,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1267,7 +1285,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1291,87 +1309,87 @@ msgstr "" " ellers enkle\n" " never, simple lag enkle sikkerhetskopier\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Uventet filslutt i arkivet" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1379,558 +1397,571 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 #, fuzzy msgid "remove files after adding them to the archive" msgstr "Tar bort enhetsnavn fra navn i arkivet" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Kan ikke verifisere arkiv som går over flere volum" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Arkivér til stdin" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Konflikt i kompresjonsflagg" -#: src/tar.c:594 +#: src/tar.c:596 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Kan ikke skrive til komprimeringsprogrammet" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s er arkivet; ikke lagret" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Kan ikke gå til filkatalogen %s" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" # -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Tar bort ledende «/» fra absolutte linker" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "Volumet «%s» stemmer ikke overens med «%s»" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1938,269 +1969,283 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 #, fuzzy msgid "ask for confirmation for every action" msgstr "Kan ikke lese bekreftelse fra brukeren" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Du kan ikke angi mer enn ett av «-Acdtrux»-flaggene" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Konflikt i kompresjonsflagg" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "Ukjent mønster «%s»" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Mer enn én grense-dato" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Ugyldig modus gitt i flagg" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "" -#: src/tar.c:1760 +#: src/tar.c:1797 #, fuzzy msgid "Invalid owner" msgstr "Ugyldig eier gitt i flagg" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 #, fuzzy msgid "Invalid record size" msgstr "Ugyldig verdi for record_size" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Blokkstørrelse må være delbart på %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Ukjent mønster «%s»" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Gammelt flagg «%c» behøver et argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Ved flere arkivfiler behøves «-M»-flagget" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Kan ikke verifisere arkiv som går over flere volum" # -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Kan ikke verifisere komprimerte arkiver" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Kan ikke bruke komprimerte arkiv som går over flere volum" # -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Kan ikke oppdatere komprimerte arkiver" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "For feig til å lage et tomt arkiv" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Flaggene «-Aru» er inkompatible med «-f -»" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Du må angi ett av «-Acdtrux»-flaggene" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Utsatt feil-avslutning for tidligere feil" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2209,79 +2254,79 @@ 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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2444,97 +2489,107 @@ msgstr "" msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Unkjent systemfeil" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "Kan ikke åpne %s" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Kan ikke eksekvere %s" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "Ukjent mønster «%s»" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "Kan ikke gjøre «stat» på %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Ødelagte filnavn--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2606,9 +2661,6 @@ msgstr "" #~ msgid "WARNING: No volume header" #~ msgstr "ADVARSEL: Manglende volumhode" -#~ msgid "Archive %s EOF not on block boundary" -#~ msgstr "Arkiv %s sluttet ikke ved en blokkgrense" - #~ msgid "Only read %d bytes from archive %s" #~ msgstr "Leste bare %d bytes fra arkivet %s" @@ -3142,6 +3194,9 @@ msgstr "" #~ "\n" #~ "Skrevet av John Gilmore and Jay Fenlason.\n" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Utsatt feil-avslutning for tidligere feil" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/nl.gmo b/po/nl.gmo index bd943abad4e23ee1bc85899eda7b87e0b58f3312..97b751bed96ba566c5316664d42781f26af0c073 100644 GIT binary patch delta 9715 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 B;YR=f delta 9603 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 diff --git a/po/nl.po b/po/nl.po index 4150275..46ba90f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,4 +1,4 @@ -# Translation of tar-1.19.90 to Dutch. +# Dutch translations for tar. # Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # @@ -6,10 +6,10 @@ # Benno Schulenberg , 2005, 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: tar-1.19.90\n" +"Project-Id-Version: tar-1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2008-02-09 22:27+0100\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-04-15 23:22+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -83,7 +83,7 @@ msgstr " [OPTIE...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Typ '%s --help' of '%s --usage' voor meer informatie.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -94,15 +94,15 @@ msgstr "" msgid "Unknown system error" msgstr "Onbekende systeemfout" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "deze hulptekst tonen" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" -msgstr "een kort gebruiksbericht tonen" +msgstr "een korte gebruikssamenvatting tonen" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NAAM" @@ -115,11 +115,11 @@ msgstr "de programmanaam instellen" msgid "SECS" msgstr "SECONDEN" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "dit aantal seconden pauzeren (standaard 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "programmaversie tonen" @@ -137,7 +137,7 @@ msgstr "%s: Te veel argumenten\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "**Interne programmafout**: optie had herkend moeten worden!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "schrijffout" @@ -196,16 +196,16 @@ msgstr "%s: optie '-W %s' is niet eenduidig\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: optie '-W %s' staat geen argument toe\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "onvoldoende geheugen beschikbaar" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "kan de huidige werkmap niet vastleggen" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "kan niet terugkeren naar de initiële werkmap" @@ -324,11 +324,23 @@ msgstr "‘" msgid "'" msgstr "’" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" -msgstr "^[jJ]" - -#: lib/rpmatch.c:72 +msgstr "^[jJyY]" + +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -553,103 +565,103 @@ msgstr "Voortijdig einde van bestand" msgid "Garbage command" msgstr "Ongeldige opdracht" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Dit ziet er niet uit als een tar-archief" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Totaal aantal geschreven bytes" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Totaal aantal gelezen bytes" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Totaal aantal verwijderde bytes: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(pijp)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Ongeldige waarde voor recordgrootte" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Geen archiefnaam opgegeven" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Kan archieven op standaardinvoer of -uitvoer niet verifiëren" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archief is gecomprimeerd. Gebruik optie '%s'." -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Kan ingepakte archieven niet bijwerken" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Aan het begin van de band -- tar sluit nu af." -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Te veel fouten -- tar sluit nu af." -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek() is niet gestopt op een recordgrens" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: bevat een ongeldig deelnummer" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Deelnummer-overloop" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "een lege tekst, terwijl gebruikersinvoer werd verwacht" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "WAARSCHUWING: Archief is onvolledig" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -661,64 +673,65 @@ msgstr "" " q tar afbreken\n" " y of Enter doorgaan\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! een subshell starten\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? dit lijstje tonen\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Geen nieuw deel -- tar sluit af.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Geen bestandsnaam opgegeven. Probeer het nog eens.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ongeldige invoer. Typ ? voor hulp.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "Opdracht %s is mislukt" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s gaat niet verder in dit deel" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s heeft een verkeerde grootte (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dit deel valt buiten de reeks" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Archief is niet gemerkt als overeenkomend met %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Deel %s komt niet overeen met %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -726,6 +739,11 @@ msgstr "" "%s: bestandsnaam is te lang om opgeslagen te worden in een GNU-meerdelenkop; " "afgekapt" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek() is niet gestopt op een recordgrens" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -737,8 +755,8 @@ msgstr[1] "Kon slechts %lu van %lu bytes lezen" msgid "Contents differ" msgstr "Inhouden verschillen" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Onverwacht einde-van-bestand in archief" @@ -856,7 +874,7 @@ msgstr[1] "%s: Bestand is gekrompen met %s bytes; aangevuld met nullen" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: bestand staat op een ander bestandssysteem; niet gearchiveerd" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "inhoud niet gearchiveerd" @@ -885,9 +903,9 @@ msgstr "%s: bestand is het archief zelf; niet gearchiveerd" msgid "%s: File removed before we read it" msgstr "%s: Bestand werd verwijderd voordat het gelezen kon worden" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" -msgstr "map niet gearchiveerd" +msgstr "map is niet gearchiveerd" #: src/create.c:1659 #, c-format @@ -936,168 +954,168 @@ msgstr "%s: Map werd hernoemd voordat de status ervan kon worden bepaald" msgid "Extracting contiguous files as regular files" msgstr "Aaneengesloten bestanden worden uitgepakt als gewone bestanden" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Poging om symbolische koppelingen als harde koppelingen uit te pakken..." -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Lezen van %s...\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan niet uitpakken -- bestand gaat door in een ander deel" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Onverwachte lange-naamkop" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Onbekende bestandssoort '%c'; uitgepakt als gewoon bestand" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Huidige %s is nieuwer of even oud" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Kan geen reservekopie van dit bestand maken" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Kan %s niet tot %s hernoemen" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Fout is niet herstelbaar -- tar sluit nu af." -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Map is hernoemd van %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Map is hernoemd" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Map is nieuw" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Ongeldig tijdsstempel" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Ongeldige wijzigingstijd (seconden)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Ongeldige wijzigingstijd (nanoseconden)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Ongeldig apparaatnummer" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Ongeldig inode-nummer" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Veld is te lang, tijdens lezen van snapshot-bestand" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Leesfout tijdens lezen van snapshot-bestand" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Onverwacht einde-van-bestand in snapshot-bestand" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Onverwachte veldwaarde in snapshot-bestand" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Ontbrekende record-afsluiting" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Onjuiste incrementele bestandsindeling" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Niet-ondersteunde versie (%) van incrementele bestandsindeling" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Onjuiste archiveringsmap: '%c' werd verwacht maar %#3o gevonden" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Onjuiste archiveringsmap: 'X' staat er dubbel" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Onjuiste archiveringsmap: lege naam in 'R'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Onjuiste archiveringsmap: 'T' werd niet voorafgegaan door 'R'" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Onjuiste archiveringsmap: lege naam in 'T'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Onjuiste archiveringsmap: 'X' is nergens gebruikt" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan met sjabloon %s geen tijdelijke map aanmaken" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, 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:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Verwijderen van %s...\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan niet verwijderen" @@ -1117,19 +1135,19 @@ msgstr "blok %s: ** Blok van NUL-tekens **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Einde-bestand **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1137,68 +1155,68 @@ msgstr "" "aangenomen" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Archief bevat ouderwetse grondtal-64 koppen" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " koppeling naar %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " onbekende bestandssoort %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Lange koppeling--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Lange naam--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Deelkop--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Verder bij byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Aanmaken van map:" @@ -1235,24 +1253,24 @@ msgstr "interproces-kanaal" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Bestandsnamen bevatten jokertekens. Gebruik '--wildcards'" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "om patroonovereenkomsten in te schakelen," -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "of '-no-wildcards' om deze melding te onderdrukken." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Komt niet voor in archief" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Is vereist maar komt niet voor in archief" @@ -1279,7 +1297,7 @@ msgstr "" "Onbekende aanhalingsstijl '%s'. Probeer '%s --quoting-style=help' voor een " "overzicht." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1299,7 +1317,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:343 +#: src/tar.c:345 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 " @@ -1320,87 +1338,87 @@ msgstr "" " nil, existing genummerd als ze al bestaan, anders simpel\n" " never, simple altijd simpele reservekopieën maken\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Hoofdbewerkingen:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "de inhoud van een archief opsommen" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "bestanden uit een archief uitpakken" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "een nieuw archief aanmaken" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "verschillen tussen archief en bestandssyteem vinden" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "bestanden aan het eind van een archief toevoegen" -#: src/tar.c:384 +#: src/tar.c:386 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:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "tar-bestanden aan een archief toevoegen" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "uit het archief verwijderen (niet gebruiken bij magneetbanden!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "label van archiefdeel controleren en stoppen" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Werkingsaanpassers:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "luchtige bestanden efficiënt verwerken" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "HOOFD[.SUB]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "versie van te gebruiken luchtige indeling (impliceert '--sparse')" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" -msgstr "oude GNU-indeling van incrementele reservekopie verwerken" +msgstr "oude GNU-indeling van incrementeel archief verwerken" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "BESTAND" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" -msgstr "nieuwe GNU-indeling van incrementele reservekopie verwerken" +msgstr "nieuwe GNU-indeling van incrementeel archief verwerken" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "niet afsluiten met een foutcode bij onleesbare bestanden" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "AANTAL" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1412,122 +1430,125 @@ 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:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "archief is doorzoekbaar" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" +"geen apparaatnummers controleren tijdens aanmaken van incrementele archieven" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" +"apparaatnummers controleren tijdens aanmaken van incrementele archieven " +"(standaard)" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Overschrijvingsopties:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "het archief na het schrijven proberen te verifiëren" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "bestanden na hun toevoeging aan het archief verwijderen" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "bij het uitpakken bestaande bestanden niet vervangen" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "bestaande bestanden bij het uitpakken overschrijven" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "elk bestand verwijderen alvorens eroverheen uit te pakken" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "bestaande mappen leegmaken alvorens eroverheen uit te pakken" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "metagegevens van bestaande mappen behouden" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "de metagegevens van bestaande mappen bij het uitpakken overschrijven " "(standaard)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Selecteren van uitvoerkanaal:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "bestanden uitpakken naar standaarduitvoer" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "OPDRACHT" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "uitgepakte bestanden via pijp naar gegeven programma sluizen" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "afsluitwaardes van dochterprocessen negeren" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" "afsluitwaardes van dochterprocessen die niet nul zijn als fout behandelen" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Behandeling van bestandskenmerken:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "toegevoegde bestanden krijgen NAAM als eigenaar" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "toegevoegde bestanden krijgen NAAM als groep" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATUM-OF-BESTAND" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" "wijzigingstijd zetten van bestanden die wegens DATUM-OF-BESTAND toegevoegd " "zijn" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "WIJZIGINGEN" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "toegevoegde bestanden krijgen (symbolische) WIJZIGINGEN in hun modus" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "MANIER" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1537,27 +1558,27 @@ msgstr "" "herstellen van de tijdsstempels na het lezen (MANIER='replace'; standaard), " "of door de tijdsstempels met rust te laten (MANIER='system')" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "bestandswijzigingstijden niet uitpakken" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "bestanden proberen uit te pakken met gelijkblijvende eigenaar" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "bestanden uitpakken als uzelf" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "altijd getallen gebruiken voor gebruikers- en groepsnamen" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "bestandspermissies ook uitpakken (standaard voor root)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1565,17 +1586,17 @@ msgstr "" "de umask van de gebruiker toepassen bij het uitpakken van bestandspermissies " "(standaard voor gewone gebruikers)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" "uit te pakken namen sorteren zodanig dat ze overeenkomen met de volgorde in " "het archief" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "hetzelfde als -p en -s samen" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1583,139 +1604,139 @@ msgstr "" "het zetten van permissies en tijdsstempels van mappen uitstellen tot het " "einde van het uitpakken" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "het effect van de optie --delay-directory-restore ongedaan maken" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Apparaatselectie en -wisseling:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHIEF" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "archiefbestand of apparaat ARCHIEF gebruiken" -#: src/tar.c:513 +#: src/tar.c:515 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:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "deze OPDRACHT gebruiken in plaats van rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "deze OPDRACHT gebruiken in plaats van rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "schijf en dichtheid opgeven" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "meerdelig archief aanmaken/opsommen/uitpakken" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "band wisselen na schrijven van AANTAL x 1024 bytes" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "script uitvoeren aan einde van elke band (impliceert -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" -msgstr "het nummer van het deel in BESTAND gebruiken/bijwerken" +msgstr "het deelnummer in BESTAND gebruiken/bijwerken" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Blokverwerking:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOKKEN" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKKEN x 512 bytes per record" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "AANTAL bytes per record (een veelvoud van 512)" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "blokken met nullen in archief negeren (betekenen einde-van-bestand)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "doorgaan met lezen tot blok compleet is (voor 4.2BSD-pijpen)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Archiefindelingskeuze:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "INDELING" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "een archief maken in de gekozen indeling" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "INDELING is een van de volgende:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "oude V7 tar-indeling" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "GNU-indeling van tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU-indeling van tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar-indeling)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax-indeling)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "hetzelfde als pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "hetzelfde als --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "hetzelfde als --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "sleutelwoord[[:]=waarde][,sleutelwoord[[:]=waarde]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "het aangeven van pax-sleutelwoorden" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1723,86 +1744,100 @@ msgstr "" "een archief met deelnaam TEKST maken; bij opsommen/uitpakken TEKST als " "zoekpatroon voor de deelnaam gebruiken" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Compressie-opties:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "compressieprogramma afleiden uit bestandsachtervoegsel" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "compressieprogramma afleiden uit bestandsachtervoegsel" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "het archief door 'bzip2' filteren" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "het archief door 'gzip' filteren" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "het archief door 'compress' filteren" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "het archief door 'lzma' filteren" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "het archief door 'gzip' filteren" + +#: src/tar.c:613 msgid "PROG" msgstr "PROGRAMMA" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "het archief door dit programma filteren (moet -d accepteren)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Lokale bestandskeuze:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "MAP" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "naar MAP gaan" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "namen van in of uit te pakken bestanden uit BESTAND halen" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T leest met NUL afgesloten namen, -C uitzetten" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" "aanhalingstekens verwijderen rond bestandsnamen gelezen met -T (standaard)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "aanhalingstekens niet verwijderen rond bestandsnamen gelezen met -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "PATROON" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "bestanden uitsluiten, gegeven als een PATROON" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "uitsluitingspatronen staan opgesomd in BESTAND" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1810,91 +1845,91 @@ msgstr "" "inhoud van mappen die CACHEDIR.TAG bevatten uitsluiten, behalve CACHEDIR.TAG " "zelf" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "alles onder mappen die CACHEDIR.TAG bevatten uitsluiten" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "mappen die CACHEDIR.TAG bevatten uitsluiten" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "alles onder mappen die BESTAND bevatten uitsluiten" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "mappen die BESTAND bevatten uitsluiten" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "systeemmappen van versiebeheer uitsluiten" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "niet automatisch afdalen in mappen" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "in het lokale bestandssysteem blijven bij maken van archief" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "recursief in mappen afdalen (standaard)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "leidende '/' niet uit bestandsnamen verwijderen" -#: src/tar.c:656 +#: src/tar.c:665 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:658 +#: src/tar.c:667 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "LIDNAAM" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "beginnen bij lid LIDNAAM in het archief" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "alleen bestanden opslaan die nieuwer zijn dan DATUM-OF-BESTAND" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATUM" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "datum en tijd alleen vergelijken wanneer gegevens veranderd zijn" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "MANIER" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "voor verwijdering een reservekopie maken, op de aangegeven MANIER" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "TEKENREEKS" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1903,90 +1938,90 @@ msgstr "" "(in plaats van '~', die standaard is tenzij door omgevingsvariable " "SIMPLE_BACKUP_SUFFIX veranderd)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Bestandsnaam-transformaties:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "dit AANTAL leidende componenten uit bestandsnamen verwijderen" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "EXPRESSIE" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "deze vervangings-EXPRESSIE gebruiken om bestandsnamen met 'sed' te " "transformeren" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Bestandsnaamselectie-opties (voor zowel in- als uitsluitingspatronen)" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "verschil tussen hoofd- en kleine letters negeren" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "patronen komen overeen met begin van bestandsnaam" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" "patronen komen overeen met alles na een '/' (is standaard bij uitsluiting)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "hoofdlettergevoelige vergelijking (standaard)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "jokertekens gebruiken (is standaard bij uitsluiting)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "exacte tekenreeksvergelijking" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "jokertekens komen niet overeen met '/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "jokertekens komen overeen met '/' (is standaard bij uitsluiting)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Informatieve uitvoer:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "de verwerkte bestanden opsommen" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "voortgangsberichten tonen voor elk AANTALste record (standaard 10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "ACTIE" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "bij elk controlepunt deze ACTIE uitvoeren" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "een bericht tonen als niet alle links gearchiveerd werden" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SIGNAAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1998,27 +2033,27 @@ msgstr "" "ontvangen wordt; mogelijke signalen zijn: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 " "en SIGUSR2; de namen zonder het voorvoegsel SIG worden ook geaccepteerd" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "bestandswijzigingstijden in UTC tonen" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "breedsprakige uitvoer naar BESTAND sturen" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "blokgetal binnen archief tonen bij elk bericht" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "bij elke actie om toestemming vragen" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "standaardinstellingen van tar tonen" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2026,33 +2061,33 @@ msgstr "" "bij opsommen of uitpakken: elke map opsommen die niet aan zoekcriteria " "voldoet" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "bestands- of archiefnamen na transformatie tonen" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STIJL" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "ook de tekens in TEKENREEKS aanhalen" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "de tekens in TEKENREEKS niet aanhalen" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Compatibiliteitsopties:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2060,56 +2095,56 @@ msgstr "" "bij aanmaken hetzelfde als --old-archive; bij uitpakken hetzelfde als --no-" "same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Andere opties:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "gebruik van mogelijk gevaarlijke opties of opdrachten uitschakelen" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Slechts één van de opties 'Acdtrux' is mogelijk" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Conflicterende compressie-opties" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Onbekende signaalnaam: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Voorbeeldbestand voor tijdsstempel niet gevonden" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Onbekende datumopmaak %2$s wordt vervangen door %1$s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Optie %s: datum '%s' wordt begrepen als %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: bestandenlijst is al gelezen" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: gelezen bestandsnaam bevat een NUL-teken" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Geldige argumenten van --quoting-style zijn:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2117,151 +2152,165 @@ msgstr "" "\n" "*Deze* tar gebruikt de volgende standaardwaarden:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Ongeldige blokindeling" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Waarschuwing: optie -I is niet mogelijk; bedoelt u misschien -j of -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Ongeldige bandlengte" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Meerdere drempeldata" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Ongeldig versienummer voor luchtige indeling" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' is op dit platform niet mogelijk" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "waarde van --checkpoint is geen geheel getal" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Ongeldige groep" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Ongeldige modus gegeven bij optie" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Ongeldig nummer" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Ongeldige eigenaar" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Ongeldige recordgrootte" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Recordgrootte moet een veelvoud zijn van %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Ongeldig aantal elementen" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Slechts één optie --to-command is toegestaan" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Ongeldig dichtheidsargument: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Onbekende dichtheid: '%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[BESTAND]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Oude optie '%c' vereist een argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "'--occurrence' betekent niets zonder een bestandenlijst" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "'--occurrence' kan niet worden gebruikt in de gevraagde werkingsmodus" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Voor meerdere archiefbestanden is de optie '-M' vereist" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Kan '--listed-incremental' niet met '--newer' combineren" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Kan meerdelige archieven niet verifiëren" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Kan ingepakte archieven niet verifiëren" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Kan geen meerdelige ingepakte archieven gebruiken" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Kan ingepakte archieven niet samenvoegen" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Een geheel leeg archief wordt niet aangemaakt" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opties '-Aru' gaan niet samen met '-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "U dient een van de opties '-Acdtrux' op te geven" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Uitgestelde afbreking na eerdere fouten" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2270,52 +2319,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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Sleutelwoord %s is onbekend of nog niet geïmplementeerd" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Patroon %s kan niet worden gebruikt" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Sleutelwoord %s kan niet worden overstegen" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Onjuiste uitgebreide kop: ontbrekende lengte" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Lengte van uitgebreide kop valt buiten bereik" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "Lengte %*s van uitgebreide kop valt buiten bereik" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Onjuiste uitgebreide kop: ontbrekende witruimte na de lengte" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Onjuiste uitgebreide kop: ontbrekend isgelijkteken" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Onjuiste uitgebreide kop: ontbrekend regeleinde" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Genegeerd: onbekend sleutelwoord '%s' in uitgebreide kop" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2324,28 +2373,28 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Onjuiste uitgebreide kop: ongeldige %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Onjuiste uitgebreide kop: overtollige %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Onjuiste uitgebreide kop: ongeldige %s: onverwacht scheidingsteken %c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Onjuiste uitgebreide kop: ongeldige %s: oneven aantal waarden" @@ -2523,98 +2572,115 @@ msgstr "Getal valt buiten toegestaan bereik: %s" msgid "Negative size: %s" msgstr "Negatieve grootte: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "Kan status van %s niet bepalen" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Fout tijdens getalsontleding, nabij '%s'" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Onbekende datumopmaak" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGUMENTEN]..." -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "Kan '%s' niet openen" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "kan niet springen" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "Bestandsnaam bevat een NUL-teken" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "Kan geen luchtige bestanden genereren op standaarduitvoer; gebruik de optie " "'--file'" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "Onjuist masker (nabij '%s')" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Onbekend veld '%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "Kan tijdsstempel van '%s' niet zetten" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Opdracht is succesvol afgesloten\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Opdracht is mislukt met afsluitwaarde %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Opdracht is afgebroken door signaal %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Opdracht is gestopt door signaal %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Opdracht resulteerde in een core-dump\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Opdracht is afgebroken\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "'--stat' vereist bestandsnamen" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "te veel argumenten" + +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "het effect van de optie --delay-directory-restore ongedaan maken" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Uitgestelde afbreking na eerdere fouten" diff --git a/po/pl.gmo b/po/pl.gmo index 637185b8109120c4a8e20d05a11b6cd33d1a00a8..f6bec1fe5afb579c70ca936133b85de39c27ba0b 100644 GIT binary patch delta 9600 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 Q{r#Z)|Mxj*`*#KX8xlskqW}N^ delta 9504 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\n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -83,7 +83,7 @@ msgstr "[OPCJE...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "U¿yj `%s --help' albo `%s --usage' ¿eby otrzymaæ wiêcej informacji\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Raporty o b³êdach nale¿y wysy³aæ do %s .\n" @@ -92,15 +92,15 @@ msgstr "Raporty o b msgid "Unknown system error" msgstr "Nieznany b³±d systemu" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "wy¶wietlenie tego opisu" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "krótka informacja o opcjach" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NAZWA" @@ -113,11 +113,11 @@ msgstr "ustawienie nazwy programu" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "poczekaj SEK sekund (domy¶lnie 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "informacja o wersji programu" @@ -135,7 +135,7 @@ msgstr "%s: Za du msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(B£¡D PROGRAMU) Opcja powinna by³a byæ rozpoznana!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "b³±d zapisu" @@ -194,16 +194,16 @@ msgstr "%s: opcja `-W %s' jest niejednoznaczna\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "brak pamiêci" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "nie uda³o siê zapisaæ bie¿acego katalogu" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "nie uda³o siê powróciæ do pocz±tkowego katalogu bie¿±cego" @@ -326,11 +326,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[yYtT]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -554,66 +566,58 @@ msgstr "Przedwczesny koniec pliku" msgid "Garbage command" msgstr "Bezsensowna komenda" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "To nie wygl±da jak archiwum tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Licza zapisanych bajtów" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Liczba przeczytanych bajtów" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Liczba skasowanych bajtów: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "B³êdna warto¶æ record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Nie podana nazwa archiwum" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Nie mo¿na zweryfikowaæ archiwum z/do stdin/stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archiwum jest skompresowane. Nale¿y u¿yæ opcji %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Nie mo¿na uaktualniæ archiwum skompresowanego" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Na pocz±tku ta¶my, teraz koñczê" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Za du¿o b³êdów, koñczê" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -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:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -621,38 +625,46 @@ msgstr[0] "Rozmiar rekordu = %lu blok" msgstr[1] "Rozmiar rekordu = %lu bloki" msgstr[2] "Rozmiar rekordu = %lu bloków" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek nie zatrzyma³ siê na granicy rekordów" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: zawiera b³êdny numer czê¶ci" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Przepe³nienie numeru czê¶ci" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF kiedy by³a oczekiwana odpowied¼ u¿ytkownika" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 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:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -663,67 +675,68 @@ msgstr "" " q Zakoñczenie programu tar\n" " y albo Enter Kontynuacja\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Uruchomienie pow³oki\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Wypisanie tej listy\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Brak nowej czê¶ci; zakoñczenie pracy.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Brak nazwy pliku. Spróbuj jeszcze raz.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, 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:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "%s polecenie zwróci³o b³±d" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s nie jest kontynuowany w tej czê¶ci" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s to z³y rozmiar (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ta czê¶æ nie jest kolejn±" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Etykieta archiwum nie pasuje do %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Czê¶æ %s nie pasuje do %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -731,6 +744,11 @@ msgstr "" "%s: nazwa pliku jest za d³uga do zapisania w nag³ówku wieloczê¶ciowego " "archiwum GNU, zostanie skrócona" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek nie zatrzyma³ siê na granicy rekordów" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -743,8 +761,8 @@ msgstr[2] "Mo msgid "Contents differ" msgstr "Zawarto¶ci siê ró¿ni±" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Nieoczekiwany EOF w archiwum" @@ -865,7 +883,7 @@ msgstr[2] "%s: Plik skurczy msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: plik w innym systemie plików; nie zosta³ zapisany" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "zawarto¶æ nie zosta³a zapisana" @@ -894,7 +912,7 @@ msgstr "%s: plik jest w tym archiwum; nie zosta msgid "%s: File removed before we read it" msgstr "%s: Plik usuniêty zanim zosta³ przeczytany" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "katalog nie zosta³ zapisany" @@ -945,165 +963,165 @@ msgstr "%s: Katalog zmieni msgid "Extracting contiguous files as regular files" msgstr "Odtwarzanie plików ci±g³ych (nie sparse) jako zwyk³ych" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Próba odtworzenia ³±cza symbolicznego jako zwyk³ego" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Czytam %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Niespodziewany nag³ówek z d³ug± nazw±" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Nieznany typ pliku `%c', odtworzony jako plik zwyk³y" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Aktualny %s jest nowszy albo w tym samym wieku" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nie mo¿na by³o zrobiæ kopii zapasowej tego pliku" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Nie mo¿na przemianowaæ %s na %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "B³±d nie do naprawienia: koniec" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Nazwa katalogu zosta³a zmieniona z %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Nazwa katalogu zosta³a zmieniona" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Katalog jest nowy" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "B³êdny czas pliku" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "B³êdny czas modyfikacji (sekundy)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "B³êdny czas modyfikacji (nanosekundy)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "B³êdny numer urz±dzenia" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "B³êdny numer inodu" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Za d³ugie pole w pliku migawkowym" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "B³±d czytania pliku migawkowego" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Nieoczekiwany EOF w pliku migawkowym" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Nieoczekiwana warto¶æ pola w pliku migawkowym" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Brakuj±ce zakoñczenie rekordu" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Z³y format pliku przyrostowego" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nie obs³ugiwana wersja formatu przyrostowego: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Z³y format katalogu zrzutów: oczekiwano '%c', znaleziono %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Z³y format katalogu zrzutów: powtórzone 'X'" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Z³y format katalogu zrzutów: pusta nazwa w 'R'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Z³y format katalogu zrzutów: 'T' nie jest poprzedzone przez 'R'" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Z³y format katalogu zrzutów: pusta nazwa w 'T'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Z³y format katalogu zrzutów: nigdy nie u¿yte 'X'" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, 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:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Bez skasowania katalogu: nie mo¿na odczytaæ stanu" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: katalog na innym urz±dzeniu: bez skasowania" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Usuniêcie %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nie mo¿na usun±æ" @@ -1123,19 +1141,19 @@ msgstr "blok %s: ** Blok zer **\n" msgid "block %s: ** End of File **\n" msgstr "blok: %s: ** Koniec pliku **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1143,68 +1161,68 @@ msgstr "" "jak uzupe³nienie dwójkowe" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiwum zawiera przestarza³e nag³ówki base64" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " ³±cze do %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " nieznany typ pliku %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--D³ugie ³±cze--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--D³uga nazwa--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Nag³ówek czê¶ci--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Kontynuacja od bajtu %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Tworzony jest katalog:" @@ -1241,25 +1259,25 @@ msgstr "kana #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "W nazwach plików u¿yto znaków dopasowania wzorców. Proszê" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" "u¿yæ --wildcards aby w³±czyæ porównywanie wzorców albo --no-wildcards ¿eby" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "wy³±czyæ to ostrze¿enie" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nie znalaz³em w archiwum" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Brak podanego wyst±pienia pliku w archiwum" @@ -1286,7 +1304,7 @@ msgstr "" "Nieznany styl cytowania `%s'. U¿yj `%s --quoting-style=help' ¿eby zobaczyæ " "listê." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1305,7 +1323,7 @@ msgstr "" "tar.\n" " tar -xf archive.tar # rozpakowanie plików z archive.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1328,86 +1346,86 @@ msgstr "" "proste\n" " never, simple proste kopie zapasowe\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Podstawowe tryby dzia³ania:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "wypisanie zawarto¶ci archiwum" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "rozpakowanie plików z archiwum" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "utworzenie nowego archiwum" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "sprawdzenie ró¿nic miêdzy archiwum i plikami na dysku" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "do³±czenie plików na koñcu archiwum" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "do³±czenie tylko plików nowszych ni¿ kopie w archiwum" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "do³±czenie plików tar do archiwum" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "skasowanie plików z archiwum (nie na ta¶mie!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "przetestowanie etykiety archiwum i wyj¶cie" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Modyfikatory dzia³ania:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "efektywne przetwarzanie plików rzadkich" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:401 +#: src/tar.c:403 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:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "backup przyrostowy w starym formacie GNU" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "PLIK" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "backup przyrostowy w nowym formacie GNU" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "bez zakoñczenia b³êdem je¿eli niedostêpne pliki" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "LICZBA" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1419,121 +1437,121 @@ msgstr "" "plików jest podana w linii poleceñ albo przez opcjê -T. LICZBA domy¶lnie " "wynosi 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "archiwum o swobodnym dostêpie" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "bez sprawdzania numerów urz±dzeñ przy tworzeniu archiwów przyrostowych" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" -msgstr "" +msgstr "ze sprawdzaniem numerów urz±dzeñ przy tworzeniu archiwów przyrostowych" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Sterowanie zamazywaniem" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "próba weryfikacji archiwum po zapisaniu" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "usuniêcie plików po dodaniu do archiwum" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "bez zamazania istniej±cych plików rozpakowanymi" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "nadpisywanie istniej±cych plików" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "usuniêcie ka¿dego pliku przed zamazaniem go rozpakowanym plikiem" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "opró¿nianie starych katalogów przed rozpakowaniem kopii z archiwum" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "zachowanie metadanych istniej±cych katalogów" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "nadpisywanie metadanych istniej±cych katalogów przy rozpakowywaniu " "(domyslnie)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Wybór strumienia wyj¶ciowego" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "rozpakowanie plików na standardowe wyj¶cie" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "POLECENIE" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "przekazanie rozpakowywanych plików do innego programu" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "zignorowanie kodów wyj¶cia procesów potomnych" -#: src/tar.c:460 +#: src/tar.c:462 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:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Przetwarzanie atrybutów plików:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "nadanie w³a¶ciciela NAZWA dodanym plikom" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "nadanie grupy NAZWA dodanym plikom" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATA_ALBO_PLIK" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "ustawianie czasu modyfikacji dodanych plików z DATA_ALBO_PLIK" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "ZMIANY" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "ZMIANA uprawnieñ dodanych plików (podanych symbolicznie)" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "METODA" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1543,28 +1561,28 @@ msgstr "" "czytaniu (METODA='replace'; domy¶lnie) albo przez nieustawianie czasu " "(METODA='system')" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "bez odtworzenia czasu modyfikacji rozpakowanego pliku" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "staranie siê o odtworzenie w³a¶cicieli plików" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "rozpakowanie plików jako w³asno¶ci rozpakowuj±cego" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "u¿ywanie numerów, nie nazw u¿ytkowników/grup" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "odtworzenie informacji o uprawnieniach plików (domy¶lnie dla superusera)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1572,15 +1590,15 @@ msgstr "" "u¿ycie umask u¿ytkownika przy odtwarzaniu uprawnieñ z archiwum (domy¶lnie " "dla zwyk³ych u¿ytkowników)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "pliki do rozpakowania posortowane jak w archiwum" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "to samo co równocze¶nie -p i -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1588,139 +1606,139 @@ msgstr "" "ustawianie czasów zmian i uprawnieñ odtworzonych katalogów opó¼nione do " "koñca rozpakowywania" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "wy³±czenie efektu opcji --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Wybór i prze³±czanie urz±dzeñ:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARCHIWUM" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "u¿ycie pliku lub urz±dzenia ARCHIWUM" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "plik archiwum lokalny, nawet je¿eli ma dwukropek" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "u¿yj POLECENIA zamiast /etc/rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "u¿yj POLECENIA zamiast rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "podanie napêdu i gêsto¶ci" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "tworzenie/wypisanie/rozpakowanie archiwum wieloczê¶ciowego" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "zmiana ta¶my po zapisaniu LICZBA x 1024 bajtów" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "uruchomienie skryptu na koñcu ta¶my (w³±cza -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "u¿ycie/uaktualnienie numeru czê¶ci w PLIKU" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Parametry bloków:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOKI" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKI x 512 bajtów na rekord" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "LICZBA bajtów w rekordzie, wielokrotno¶æ 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorowanie wyzerowanych bloków w archiwum (oznacza EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "podzielenie na bloki przy odczycie (dla pipe 4.2BSD)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Wybór formatu archiwum:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "utworzenie archiwum w danym formacie." -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMAT mo¿e byæ jednym z nastêpuj±cych:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "stary format tara z V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "format GNU dla tara <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "format tara GNU 1.13" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "format POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "to samo co pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "to samo co --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "to samo co --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "s³owo_kluczowe[[:]=warto¶æ][,s³owo_kluczowe[[:]=warto¶æ]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "ustawianie s³ów kluczowych formatu pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1728,88 +1746,103 @@ msgstr "" "utworzenie archiwum z nazw± wolumenu TEKST. Przy wypisywaniu/rozpakowaniu " "TEKST bêdzie u¿yty jako wzorzec dopasowania dla nazwy" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Opcje kompresji" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" "u¿ycie przyrostka nazwy archiwum dla wyznaczenie programu kompresuj±cego" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "" +"u¿ycie przyrostka nazwy archiwum dla wyznaczenie programu kompresuj±cego" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "filtrowanie archiwum przez bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "filtrowanie archiwum przez gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "filtrowanie archiwum przez compress" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "filtrowanie archiwum przez lzma" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "filtrowanie archiwum przez gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "filtrowanie przez PROGRAM (akceptuj±cy -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Wybór plików lokalnych:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "KATALOG" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "przej¶cie do KATALOGU" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "nazwy plików do rozpakowania lub spakowania z PLIKU" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T czyta nazwy zakoñczone zerem, wy³±cz -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" "usuniêcie znaków cytowania z nazw plików czytanych poprzez opcjê -T " "(domy¶lnie)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "bez usuwania znaków cytowania z nazw plików czytanych poprzez opcjê -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "WZORZEC" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "wykluczenie nazw pasuj±cych do WZORCA" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "wykluczenie nazw pasuj±cych do wzorców w PLIKU" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1817,87 +1850,87 @@ msgstr "" "wykluczenie katalogów zawieraj±cych znacznik pamiêci podrêcznej CACHEDIR." "TAG, oprócz samych plików znacznika" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "wykluczenie katalogów zawieraj±cych CACHEDIR.TAG i ich podkatalogów" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "wykluczenie katalogów zawieraj±cych CACHEDIR.TAG" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "wykluczenie katalogów zawieraj±cych PLIK i ich podkatalogów" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "wykluczenie katalogów zawieraj±cych PLIK" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "wykluczenie katalogów systemu administrowania wersjami" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "bez automatycznego zag³êbiania siê w katalogi" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "pozostanie w jednym systemie plików" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "zag³êbianie siê w podkatalogi (domy¶lnie)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "bez usuwania pocz±tkowego `/' z nazw plików" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "archiwizacja plików, na które wskazuj± ³±cza symboliczne" -#: src/tar.c:658 +#: src/tar.c:667 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "NAZWA-PLIKU" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "zaczêcie od pliku NAZWA-PLIKU w archiwum" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "zapisanie tylko plików nowszych ni¿ DATA albo data PLIKU" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATA" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "porównywanie daty i czasu tylko dla zmienionych danych" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "TRYB" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "kopia zapasowa przed usuniêciem, wybranie TRYBU zarz±dzania wersjami" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "NAPIS" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1905,92 +1938,92 @@ msgstr "" "kopia zapasowa przed usuniêciem, zmiana domy¶lnego przyrostka ('~', je¿eli " "nie zmieniony przez zmienn± ¶rodowiska SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Zmiany nazwy plików:" -#: src/tar.c:676 +#: src/tar.c:685 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:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "WYRA¯ENIE" -#: src/tar.c:679 +#: src/tar.c:688 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:684 +#: src/tar.c:694 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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "traktowanie tak samo ma³ych i wielkich liter" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "nazwy porównywane od pocz±tków nazw plików" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "wzorce odnosz± siê do nazw po ka¿dym / (domy¶lnie)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "odró¿nianie ma³ych i wielkich liter (domy¶lnie)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "u¿ywanie wildcards (domy¶lnie dla wykluczania)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "dos³owne porównywanie napisów" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "wildcards nie s± porównywane z `/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "wildcards s± porównywane z '/' (domy¶lnie dla wykluczania)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Informacje:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "wypisywanie szczegó³ów o przetwarzanych plikach" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "wypisywanie co ILE rekordów informacji o przetwarzaniu (domyslnie co 10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "AKCJA" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "wykonanie AKCJI przy ka¿dym punkcie kontrolnym" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "wypisanie komunikatu je¿eli nie wszytkie ³±cza zosta³y zapisane" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SYGNA£" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2002,27 +2035,27 @@ msgstr "" "sygna³y: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2; nazwy bez prefiksu SIG " "s± te¿ akceptowane" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "wypisanie dat modyfikacji plików w UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "zapisanie dok³adnych informacji w PLIKU" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "pokazanie przy ka¿dym komunikacie numeru bloku w archiwum" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "proszenie o potwierdzenie ka¿dego dzia³ania" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "wypisanie domy¶lnych ustawieñ tar-a" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2030,33 +2063,33 @@ msgstr "" "wypisywanie ka¿dego katalogu nie pasuj±cego do kryteriów szukania przy " "wypisywaniu albo rozpakowywaniu archiwum" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "pokazanie nazw plików albo archiwów po przeszkta³ceniu" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STYL" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "dodatkowe ujmowanie w znaki cytowania znaków z £AÑCUCHA" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "wy³±czenie ujmowania w znaki cytowania znaków z £AÑCUCHA" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Opcje kompatybilno¶ci:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2064,56 +2097,56 @@ msgstr "" "przy tworzeniu: to samo co --old-archive przy odtwarzaniu: to co --no-same-" "owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Inne opcje:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "wy³±czenie u¿ywania potencjalnie szkodliwych opcji" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Nie mo¿na podaæ wiêcej ni¿ jednej opcji z `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Niezgodne opcje kompresji" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Nieznana nazwa sygna³u: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Nie znaleziono pliku z dat±" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Postawienie %s w miejscu nieznanego formatu daty %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Opcja %s: Potraktowanie daty `%s' jako %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: lista plików ju¿ przeczytana" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: przeczytana nazwa pliku zawiera znak NUL" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Argumenty opcji --quoting-style:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2121,109 +2154,115 @@ msgstr "" "\n" "*Ten* tar ma domy¶lne parametry:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "B³êdny wspó³czynnik ³±czenia w bloki" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Uwaga: opcja -I nie jest u¿ywana, mo¿e chodzi o -j albo -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "B³êdna d³ugo¶æ ta¶my" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Wiêcej ni¿ jedna data graniczna" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "B³êdna warto¶æ wersji plików rzadkich" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "ten system nie pozwala na u¿ycie --atime-preserve='system'" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "warto¶æ --checkpoint nie jest liczb± ca³kowit±" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: b³êdna grupa" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "B³êdne uprawnienia podane w opcji" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "B³êdny numer" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "B³êdny w³a¶ciciel" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "B³êdna wielko¶æ rekordu" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Rozmiar rekordu musi byæ wielokrotno¶ci± %d" -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "B³êdna ilo¶æ elementów" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Wolno u¿yæ tylko jednej opcji polecenia --to-command" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "B³êdna specyfikacja gêsto¶ci: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Nieznana gêsto¶æ: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[PLIK]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Stara opcja `%c' wymaga argumentu." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence nie ma znaczenia bez listy plików" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence nie mo¿e byæ u¿yte w tym trybie" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Archiwum sk³adaj±ce siê z wielu plików wymaga opcji `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Nie mo¿na po³±czyæ --listed-incremental z --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2231,42 +2270,50 @@ msgstr[0] "%s: Za d 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Nie mo¿na zweryfikowaæ archiwum wieloczê¶ciowego" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Nie mo¿na zweryfikowaæ archiwum skompresowanego" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Nie mo¿na u¿ywaæ wieloczê¶ciowego archiwum skompresowanego" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Nie mo¿na po³±czyæ skompresowanych archiwów" -#: src/tar.c:2293 +#: src/tar.c:2332 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:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Tchórzliwie odmawiam utworzenia pustego archiwum" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opcje `-Aru' s± niekompatybilne z `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Musisz podaæ jedn± z opcji `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Zakoñczenie z b³êdem z powodu uprzednich b³êdów" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2276,52 +2323,52 @@ msgstr[0] "%s: Plik skurczy msgstr[1] "%s: Plik skurczy³ siê o %s bajty" msgstr[2] "%s: Plik skurczy³ siê o %s bajtów" -#: src/xheader.c:158 +#: src/xheader.c:156 #, 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:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Nie mo¿e byæ u¿yty wzorzec %s" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "S³owo kluczowe %s nie mo¿e byæ zast±pione" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "B³êdny nag³ówek rozszerzony: brakuje d³ugo¶ci" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "D³ugo¶æ nag³ówka rozszerzonego jest poza dozwolonym zakresem" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "B³êdny nag³ówek rozszerzony: brakuje odstêpu po d³ugo¶ci" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "B³êdny nag³ówek rozszerzony: brakuje znaku równo¶ci" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "B³êdny nag³ówek rozszerzony: brakuje znaku mowej linii" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Zignorowane nieznane s³owo kluczowe nag³ówka rozszerzonego `%s'" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2330,27 +2377,27 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "B³êdny nag³ówek rozszerzony: b³êdny %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "B³êdny nag³ówek rozszerzony: nadmiarowe %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, 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:1338 +#: src/xheader.c:1336 #, 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" @@ -2523,97 +2570,114 @@ msgstr "Liczba spoza dozwolonego zakresu: %s" msgid "Negative size: %s" msgstr "Ujemny rozmiar: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "b³±d stat(%s)" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "B³±d przetwarzania liczby blisko `%s'" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Nieznany format daty" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGUMENTY...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "nie mo¿na otworzyæ `%s'" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "nie mo¿na ustawiæ pozycji" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "nazwa pliku zawiera znak NUL" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "nie mo¿na utworzyæ pliku rzadkiego na standardowym wyj¶ciu, u¿yj opcji --file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "nieprawid³owa maska (ko³o `%s')" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr " Nieznane pole `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "nie mo¿na ustawiæ czasu na `%s'" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Polecenie zakoñczy³o siê poprawnie\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Polecenie zakoñczy³o siê niepoprawnie z kodem %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Polecenie zosta³o zakoñczone sygna³em %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Polecenie zosta³o zatrzymane sygna³em %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Zosta³ zapisany obraz pamiêci (core dump) polecenia\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Polecenie zakoñczone\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat wymaga podania nazwy pliku" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "za du¿o argumentów" + +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "wy³±czenie efektu opcji --delay-directory-restore" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Zakoñczenie z b³êdem z powodu uprzednich b³êdów" diff --git a/po/pt.gmo b/po/pt.gmo index 1d841f19ec8c3d81370595bc50500ec026f5a0f7..ea3e840be7b7becd51564136f592fe8b339bf544 100644 GIT binary patch delta 1012 zcmXxjKTK0m6vy#XS_-XFpaP-@6dnb&R3EiOg_w{y5Qs5R7zkm50oY8GN%9uL?w~Fh z2ji^CGbWD2nBWA1|6-7kxDiHz$i(+|`#8z%r}y@~*L%*nZ^v8lf}L#Qxe@)0ON^&6 zvtit>;)B?To1Mk4*o{B10smtwrW0l!dYHvg)OFK1h|8$whS-K%*n<05FbgbRU3tKD z)QuC^iA$(Wy})z$8FTnET0g=P^L)~*9;dJ!=TRG5#XP=7AHN`fXoom}-8E*-{J%}| zJg!Ca4|sw3Z|uc`Xx>(9*2H`eS+a5Lz=wDPAK^88i%RGls!|82`&v_G z4+6?vAWJrl z+Q0(pOsv&Yf0gu8bm1;uVSbEiMGq%UJsn4qvU$`Qd5m}PCHnXsRr(}l(|R6rIExh6 z-Fp!gdakOW7Wb+Dx>2DF6*`>??Oc&#aAu6QxlpgQd%EVzNO9~kLmBFXD|k6v3zghy zC=mr!ch#%L^gTY5aTTMVp@YJk;ew=GJEEz33n+{Wy=tn2LT93x;e~(VEr~E&`!1Fl ZC>2XLbG|=RE*Jb#xS1MDhQkeSVkgyXQGEaa delta 1126 zcmX}rPe@cz6vy$SgqK88^^}fg%d&$A+4gQ77^5-BZm>>6}G5_ z(LxASt8oE4@CVjoxWa5bc3=eeU;~~+tsBQaoI$3K4 z>b8^dan$@3)cU8W%zeg!7PPEcO38lI$tO`Ca2@yIEDqu#>ZE&vOCNF+^rMZBr@m=JQ_8hhT zHL7WUV*+=PHkIHMYQBIDpCO6%L%(;b{(6BnQ);MyAKFY^s^Fb|(768Q8tByY(@OA9 zu@aTssna=&-?&uG|Ig6LRe#5&K2g&*ss1|2agw@ N?9gbc_$hR+>_4$Cb;1Au diff --git a/po/pt.po b/po/pt.po index dee574a..f2b0b99 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.11.9\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 1996-04-20 21:50\n" "Last-Translator: António José Coutinho \n" "Language-Team: Portuguese \n" @@ -83,7 +83,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Para mais informação, tente \"%s --help\".\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -92,15 +92,15 @@ msgstr "" msgid "Unknown system error" msgstr "Erro desconhecido, do sistema" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -135,7 +135,7 @@ msgstr "" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 #, fuzzy msgid "write error" msgstr "Escreve-se registo\n" @@ -195,16 +195,16 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "A antiga opção `%c' exige um argumento." -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Não se conseguiu determinar a directoria corrente" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -331,11 +331,23 @@ msgstr "" msgid "'" msgstr "" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -529,107 +541,107 @@ msgstr "Fim-de-ficheiro prematuro" msgid "Garbage command" msgstr "Comando desconhecido" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Isto não se parece a um arquivo \"tar\"" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 #, fuzzy msgid "Total bytes read" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Valor inválido para tamanho de registo (record_size)" -#: src/buffer.c:459 +#: src/buffer.c:478 #, fuzzy msgid "No archive name given" msgstr "Não deram nome de arquivo, que fazer?" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Não se pode de verificar arquivos stdin ou stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 #, fuzzy msgid "Cannot update compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "No princípio da fita, pára-se imediatamente" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Erros de mais: termina-se" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "" -msgstr[1] "" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "" +msgstr[1] "" + +#: src/buffer.c:793 #, 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ATENÇÃO: O arquivo está incompleto" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -641,69 +653,76 @@ msgstr "" " ! Criar uma \"sub-shell\" (interpretador de comandos)\n" " ? Escrever esta lista\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Não há novo volume; termina-se. \n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s não tem continuidade neste volume" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, 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:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora da sequência" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, 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:1276 +#: src/buffer.c:1304 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "O volume não condiz! %s!=%s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "" +"O fim-de-ficheiro do arquivo %s não se encontra na fronteira de um bloco" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -716,8 +735,8 @@ msgstr[1] "%s: S msgid "Contents differ" msgstr "Tempo de modificação" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fim de ficheiro inesperado no arquivo" @@ -843,7 +862,7 @@ msgstr[1] "O ficheiro %s diminuiu em %d \"bytes\", ser 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 #, fuzzy msgid "contents not dumped" msgstr " (imagem da memória despejada \"core dumped\")" @@ -873,7 +892,7 @@ msgstr "%s msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -924,174 +943,174 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "Estão-se a extrair ficheiros contíguos como sendo ficheiros normais" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "" "Está-se a tentar extrair ligações simbólicas (sym. links) como ligações " "físicas (hard links)" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Leitura de %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, fuzzy, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "" "Tipo \"%c\" do ficheiro \"%s\" desconhecido; extrai-se como um ficheiro " "normal" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Não se consegue mudar o nome de %s para %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "Mudou-se o nome do directoria %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "Mudou-se o nome do directoria %s" -#: src/incremen.c:441 +#: src/incremen.c:502 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "O directoria %s é novo" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 #, fuzzy msgid "Read error in snapshot file" msgstr "Erro de leitura sobre %s" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Não se pode mudar para a directoria %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Apaga-se %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Não se consegue apagar %s" @@ -1111,86 +1130,86 @@ msgstr "bloco %10ld: ** Bloco de NULs **\n" msgid "block %s: ** End of File **\n" msgstr "bloco %10ld: ** Fim-de-ficheiro **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, fuzzy, c-format msgid "block %s: " msgstr "bloco %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " ligação para %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " tipo de ficheiro desconhecido \"%c\"\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeçalho de volume--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua no \"byte\" %ld--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Criação de directoria::" @@ -1229,24 +1248,24 @@ msgstr "" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Não foi encontrado no arquivo" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Não foi encontrado no arquivo" @@ -1272,7 +1291,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1283,7 +1302,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1295,87 +1314,87 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Fim de ficheiro inesperado no arquivo" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1383,556 +1402,569 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 #, 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:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Não se pode verificar arquivos multi-volume" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Arquivo para stdin" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Há conflitos entre as opções de compressão" -#: src/tar.c:594 +#: src/tar.c:596 #, 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:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s é o arquivo; não será arquivado" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Não se pode mudar para a directoria %s" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Retira-se \"/\" das ligações (\"links\") absolutas " -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1940,268 +1972,282 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 #, fuzzy msgid "ask for confirmation for every action" msgstr "Não se consegue obter confirmação, do utilizador" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Não se pode especificar mais do que uma das opções \"-Acdtrux\"" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Há conflitos entre as opções de compressão" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "Opção \"%c\" desconhecida" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 #, fuzzy msgid "Invalid record size" msgstr "Valor inválido para tamanho de registo (record_size)" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1854 +#: src/tar.c:1893 #, fuzzy msgid "Only one --to-command option allowed" msgstr "Só se permite uma opção de compressão" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Opção \"%c\" desconhecida" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "A antiga opção `%c' exige um argumento." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Para usar vários arquivos é necessária a opção \"-M\"" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Não se pode verificar arquivos multi-volume" -#: src/tar.c:2269 +#: src/tar.c:2308 #, fuzzy msgid "Cannot verify compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Não se pode de usar arquivos multi-volume comprimidos" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Recusa-se, covardemente, a criar um arquivo vazio" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "As opções \"-Aru\" são imcompatíveis com \"-f -\"" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Tem que se especificar uma das opções \"-Acdtrux\"" -#: src/tar.c:2483 -#, fuzzy, c-format -msgid "Error exit delayed from previous errors" -msgstr "Erro só assinalado no fim da execução" +#: src/tar.c:2529 +#, c-format +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2210,79 +2256,79 @@ 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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2444,97 +2490,107 @@ msgstr "" msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Erro desconhecido, do sistema" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "Não se consegue abrir %s" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Não se consegue executar %s" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "Opção \"%c\" desconhecida" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "Não se consegue executar \"stat\" para o ficheiro %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Nomes de ficheiros truncados--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2606,10 +2662,6 @@ msgstr "" #~ msgid "WARNING: No volume header" #~ msgstr "ATENÇÃO: Não há cabeçalho de volume" -#~ msgid "Archive %s EOF not on block boundary" -#~ msgstr "" -#~ "O fim-de-ficheiro do arquivo %s não se encontra na fronteira de um bloco" - #~ msgid "Only read %d bytes from archive %s" #~ msgstr "Só se leram %d \"bytes\" do arquivo %s" @@ -3128,6 +3180,10 @@ msgstr "" #~ msgid "Obsolete option name replaced by --backup" #~ msgstr "Nome de opção obsoleto, foi substituído por \"--touch\"" +#, fuzzy +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Erro só assinalado no fim da execução" + #, fuzzy #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 12c225fa8da5cbd8cb0ba7163e695be6c9714db1..d0c749f43f4bbf603e2fffcf3cec37dcc63f11ab 100644 GIT binary patch delta 2991 zcmYk;drXye9LMqR5!5(bM7fC=9z?t$auEh82zbHN3bn)#QY#A)wL~$M82aAS~s-BboEE2-JG@ATyC0MtLXhXJZ(MW`@DX?=kmLJf4}F99kpj` zoXf*P_Zi1tVkB`a)a+v{4CBPHAi|74TgWLMm*Hq^z%jTVBe5Ix{#ne#UvU%;=jJpl zz!A6+hvFVgFmtSnLL3)PVl?(*GX8+E*oRXwHmbkla#RELI2?B%ec2(*!PhVqFQEqP z8Peb0aMZx_U6*1s{o6M8flkckf#awKzQ+^{VN{8j=30!Cs8`~h*oJBNs(bwmW>CM4 zK1^e@W3dc};aXH?nkD_)%M?8LJ`TbUQ62W6UicX&;2)TWJ}zni6{v=`V>-TqW!Q^T zFh0g?BF@9$lA+$;k6CyQ9j#d(h3Pnwe5=7K)B}x}gvU@b{S1|ntEdj|VBJ*DMP;l4 z)zMZ|JBN@YS~qIIUm#uCpXkG=c=Au#GFd1!G#i!58q^CN$fWHQ=HTb32K!LY4`By| zV>a?$Vq}a~hniqBvW@HzY5=dho=zbDWXmpcK{LFHESrV0vm!7K)xc;}!^Oy- zE#{=>)}aRMpfYwCm6@+G8waqCdM_7)OMx121M0mNhXQ@t5!66Vqf&kWX~V9g1~Qm$ zN6*Eg8k&U4#1af<40+T#P@C-ts-tu6^>0uax#=24CxfXw$rRM#SWaZsW}rU5N}Pq8 zaSC?hWW0eM^pTceW;l7N7o*;r=U%TxrMwNb7hXgS;4Nef)`Miwu`3j`d2YE6B(e?z zsZU0I4Y{ZWrlC??g-wj09r?s9oSS-o1k!{}M`ff6mHHOcUU><%BqvczbPY@O{U`YP zAE-oSpb@!edyziu1ZoqWM<#DSp`QB(3o(w?mGVWXCES7QQ^53$^wqQ8T-U8fYKtCpw9fu9u*` zsx_zq96(1SeUE}tbr~6)-E@uTriXd~YAL3oHf5>nQp}^i0gLb`D#gE`I!Yuh`B;V( z*o2zMSMK$Mapa$}l{0Onaud$P05S%Wn<wLFBOj(@}e4C6-|; z>W8HV_1+~^dmhrD-JXC-c@8Rr3(<$G9SZtPcB6Lh0r!D-P;1zW8u2yMz#^HJ);u3| zzZ`YH4t?0+-hTs?nNLs|xsLqV7}9YUEXQ-VtUd{jHDF$#B~Pv8Fm3R=5Us5L!@(fAv( zjP^I`#R;TEnV5^3!3s>lO~@m*A2k4FQHP${M$9D!63UL2;5kAWe}UMgk?Pn>R1%u; z79yN*{71u5arCWanwPQnx2BL|GC5j2QcJQYU>X4}HoQ#}&Usl%C+}!l6oWSzrsK~&<^rC@*zp{3Q{0r(sB}D)L delta 3168 zcmYk;c~Dhl7{~D!g_Nrz3W9*kVbN5QML}>E1w#!Vc8)zhgFb=j324 z#PPTUlW{Nh!4sHhOwhE`=*Ni*7>l=Y5Skcc;$bk3!#vc$UQ`Erus^5cDEtP~ z@n2NJsl7YbL=88Q&amZukgux#1kDg9n(3>136JC649z7{~QE5Rc*z{MHE|co`qTtEd5QpdRSTZa5}jK2AX;P>1U1FlOQz zoQ}6~G>(ZgW(2Om@RXsRKZ!Z`2L?4~gQ@c*oPg?ZBkG3zn1bJ--t;=EB9Aa%8gLlu zcp<7{b*O>fLiKYBDWd5>C437R(B5Q` zh4HA4XP}-d#U5CX{LBt^>h}PWvuQ!S=vicWnQN#-?j%xwHM+5qsG3PZy=fLQjb=9X z#AT=s)}T6WLVo4|JKficO86^OCc3#V1hDZ9+}S9#q1of;9Bt*GN+4HY$;B zd@Cw_GSZhBgGyvB>b^2mM*&nN4q~`ssITWd(v|rWwfJJ_Oatbl&KIF76I|*vYOot8 zb|62qn;lg*$50)%VKH99(U?IwvTzATU=ylB&Foxw6!qN4&iNlurN4z*8~-2)1WgL{ zCP|ZnD&;KHVk$#rxCNtdAL{GakLuuERH;v60~y>wK6&HgqMmO=#xO@vl{t-?g6pU? zb02f{{aaS&T+PQKE;OKSXhT)tDsr#6i;Q8CxTwWgfE2^bMBQiO1l)uw`6sBUyo^fV z4r&UM_(YWWP#nehrj&+CwG)ToG1T||BkF6ohw3PU*UH8MEW%aJ@iEj?TtKaj?)+WW z99yVGI1ZI)CGs;{o%8QwP@mUNG?akSRHlR3sZ=FM(q^gSW{lwYAZjWOp%&){j_sJw z@kN}7v6Mlpe-3J#Em(lZaWP&SO8xaF6L?KsXh5!+R#YiFa2h647G=I1b$%PFQf=(= z@CNeoW)NlL5i=F_CwL7ip*Nl5?@^VyhmT|C2EpOJgbP1FGK z)Kdc%qB>fOO6+Yc#CFsg`5UKWe_mUEU&>L>`%(SAfm-y(RezQKEUJ{hp@m9cpGzug z6=$Qa&qmFqjY_-`mEd92+@Eubky}?RE5e=l?iUA!M)~F9E;ac1EsOj z$i}$NP}=Y+5@FnhP{E;62ov z^kc=SM3a%Kn?vh1#Q2O57YN zF>Nn)VxGso#M92PAA1v;x-P^DqLQd0b`sk{sjlpZ?V)+D^pOFMdl98XHL;0!l29?` z5UYp^VhXV^bjX!5WCty6e4gR|1U`$ihuT-ll`XrH%e%(pNz?fcH z3*5IV+*Xa(7w*e)2Yhb7TW9PlZ)g90%UvC?eIBpR_P0c3PKrt^@dxaOL)reo6|2(g UbCY3sw42o{J?@sNIn7=F13QyvfdBvi diff --git a/po/pt_BR.po b/po/pt_BR.po index dee356e..63fca5a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2002-11-27 20:30-0300\n" "Last-Translator: Alexandre Folle de Menezes \n" "Language-Team: Brazilian Portuguese \n" @@ -85,7 +85,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Tente `%s --help' para mais informações.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -97,15 +97,15 @@ msgstr "" msgid "Unknown system error" msgstr "Erro de sistema desconhecido" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -118,11 +118,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -140,7 +140,7 @@ msgstr "%s: a op msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -199,16 +199,16 @@ msgstr "%s: a op msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opção `-W %s' não aceita um argumento\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "memória esgotada" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Impossível mudar o diretório de trabalho" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Impossível salvar diretório de trabalho" @@ -328,11 +328,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -535,104 +547,104 @@ msgstr "Fim de arquivo prematuro" msgid "Garbage command" msgstr "Comando sem sentido" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Este não parece ser um arquivo-tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Total de bytes escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Total de bytes escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Valor inválido para \"record_size\"" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Nome de arquivo-tar não informado" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "" "Impossível verificar arquivos-tar de entrada/saída padrão (stdin/stdout)" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Impossível atualizar arquivos-tar compactados" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "No princípio da fita, encerrando agora" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Muitos erros, encerrando" -#: src/buffer.c:678 -#, fuzzy, 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[1] "Bloco desalinhado (%lu bytes) no arquivo-tar" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Tamanho de registro = %lu blocos" msgstr[1] "Tamanho de registro = %lu blocos" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, fuzzy, 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[1] "Bloco desalinhado (%lu bytes) no arquivo-tar" + +#: src/buffer.c:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contém um número de volume inválido" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Sobrecarga de número de volumes" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare o volume #%d para %s e tecle Enter: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Fim-de-arquivo onde era esperado resposta do usuário" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "AVISO: O arquivo-tar está incompleto" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -644,69 +656,74 @@ msgstr "" " ! Criar um \"sub-shell\"\n" " ? Mostra esta lista\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Nenhum volume novo; encerrando.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "comando `%s' falhou" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s não continua neste volume" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s não continua neste volume" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s é o tamanho errado (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora de sequência" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "O arquivo-tar não rotulado para casar com %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "O volume %s não casa com %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -718,8 +735,8 @@ msgstr[1] "S msgid "Contents differ" msgstr "O conteúdo é diferente" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Final-de-arquivo inesperado no arquivo-tar" @@ -837,7 +854,7 @@ msgstr[1] "%s: o arquivo diminuiu %s bytes; completando com zeros" 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -866,7 +883,7 @@ msgstr "%s: arquivo msgid "%s: File removed before we read it" msgstr "%s: arquivo removido antes de ser lido" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -917,168 +934,168 @@ msgstr "%s: Diret msgid "Extracting contiguous files as regular files" msgstr "Extraindo arquivos contíguos como sendo arquivos normais" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Tentativa de extrair \"links\" simbólicos como \"links\" físicos" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Lendo %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Fim de arquivo inesperado nos nomes cifrados" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Tipo de arquivo '%c' desconhecido; extraindo como arquivo normal" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Impossível fazer backup deste arquivo" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Impossível renomear para %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Erro não é recuperável: saindo agora" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Diretório foi renomeado" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Diretório foi renomeado" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: O diretório é novo" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Carimbo de horário inválido" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Modo inválido informado na opção" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Número de dispositivo inválido" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Número de inode inválido" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Final-de-arquivo inesperado no arquivo-tar" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Impossível alocar memória para um fator de bloco %d" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, fuzzy, 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" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Removendo %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Impossível remover" @@ -1098,19 +1115,19 @@ msgstr "bloco %s: ** Bloco de NULs **\n" msgid "block %s: ** End of File **\n" msgstr "bloco %s: ** Fim-de-arquivo **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "bloco %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1118,68 +1135,68 @@ msgstr "" "complemento de dois" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "o arquivo-tar contém cabeçalhos base-64 obsoletos" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " link para %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " tipo de arquivo \"%s\" desconhecido\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeçalho de volume--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua no byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Criando de diretório:" @@ -1216,24 +1233,24 @@ msgstr "canal interprocesso" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Não foi encontrado no arquivo-tar" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Não foi encontrado no arquivo-tar" @@ -1258,7 +1275,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1278,7 +1295,7 @@ msgstr "" " %s -tvf arquivo.tar # Lista todos os arquivos em arquivo.tar.\n" " %s -xf arquivo.tar # Extrai todos os arquivos de arquivo.tar\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1300,87 +1317,87 @@ msgstr "" " nil, existing numera se existe backup numerado, se não faz simples\n" " never, simple sempre faz backups simples\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Final-de-arquivo inesperado no arquivo-tar" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1388,559 +1405,572 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Erro ao escrever para saída padrão" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Impossível verificar arquivos-tar multi-volume" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Opções de formato do arquivo-tar conflitantes" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Opções de compressão conflitantes" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: arquivo é o arquivo-tar; não será arquivado" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Impossível mudar o diretório de trabalho" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Removendo `%.*s' inicial dos nomes dos membros" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "O volume %s não casa com %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1948,267 +1978,281 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Não é possível especificar mais do que uma das opções \"-Acdtrux\"" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Opções de compressão conflitantes" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " tipo de arquivo \"%s\" desconhecido\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Arquivo de datas não encontrado" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Substituindo %s pelo formato de data desconhecido %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Fator de blocagem inválido" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Aviso: a opção -I não é suportada; talvez a intenção fosse -j ou -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Tamanho da fita inválido" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Mais do que uma data limite" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Grupo inválido" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Modo inválido informado na opção" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Número de inode inválido" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Dono inválido" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Tamanho de registro inválido" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "Tamanho da fita inválido" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "A opção antiga `%c' exige um argumento." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Múltiplos arquivos-tar é exigem a opção \"-M\"" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Impossivel combinar --listed-incremental com --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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: 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)" -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Impossível verificar arquivos-tar multi-volume" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Impossível verificar arquivos-tar compactados" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Impossível usar arquivos-tar compactados multi-volume" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Impossível atualizar arquivos-tar compactados" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Recusando a criar um arquivo-tar vazio" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "As opções `-Aru' são incompatíveis com `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Deve ser especificada uma das opções \"-Acdtrux\"" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Saída por erro atrasada pelos erros anteriores" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2217,79 +2261,79 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: O arquivo encolheu %s bytes" msgstr[1] "%s: O arquivo encolheu %s bytes" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, 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" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "o valor do arquivo-tar %s está fora da faixa %s: %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2452,97 +2496,107 @@ msgstr "N msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Erro de sistema desconhecido" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Impossível fechar" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " tipo de arquivo \"%s\" desconhecido\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Impossível saltar para %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "O processo filho morreu com o sinal %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Nomes de arquivos truncados--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2994,6 +3048,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Escrito por John Gilmore e Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Saída por erro atrasada pelos erros anteriores" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/ro.gmo b/po/ro.gmo index 9a93bd668cd0a83d59ce6e7034d62648985de5bc..eb358e38ace0408d4c0fe80e4db5120448314a81 100644 GIT binary patch delta 6354 zcmY+|2Yi>s9mnwt*(78_NCF{$LINbL48jNymV^~n7_vdA6p*E?7Lf;)AP6Yf0s>ZO zSVCD6MO0S77OaXu5Rf9Wszn(U0j(AF^UWPr@8$3RzPtbP+;h+G?*1TmPWmk`^YhNf z1S~a_R6k>?W6Mxuim4BdQLizR;*CkbM==f;U=WsIIBs(8a^D}qhV-AsGz{hD6l{d4 zScH{uI`TZv6jNzLM+qk532cG4FcBN_5sjU(Dh|RbI2ogGKGwjMSQ+2MJUoheaA-AS znqYk#iX)M)%t4Ii`Q{TUOxE1QbPQoydb4b-kF7Bq$6+m8jU(_7DkHU%>;zh&9yl2D z(R1y6m_z#_YQj~RttMQXk1U>VI#AKT)3GM5!lt+vmC8FvGE6Gz(f9eN_Ha~+XP_p! z26=}0!1aIW`lEfuG@w5p`Ol2wqc$!=Ps{uo6|Oahou4CHzy$L&t#v5sfl(NN8P4XY z`#WI^9E4iR<<7&HLHirj(xs4|V9Y~hx?KwS&!sYs4y{=U>Pmzi<~(ZLfVy_PEDWOE1a*BY)T#1@P|@z5h@UH=W_R^w0Fl&PF7@~;`UphL&xK~%~n-~+e_bMOQ*X%oaw4aHpa!`7(G zv_-A)7}Uh)qQ=?c+V7$6{|ZT_@iD0EoE6N@4ZJ_D`?I zsHJI#dgF=CImkgVD^Mvuh`R0u`mkCqKlj)Y)&G=7MK^3mrREIkn1zsM?fML77gUPJ zqE5ve^kIqf5b`5vuAuGmpe<-B52l3w7NVr+18sCUD!C)XWZ0fO>;bSQ%eH zo!gD>`-2!o`w~Xu*QhrNY;MQPb`C;LwwZ$(ZyToKS!Ag^^CK1gRHpFegRg(ZWxJ!Fwvv( z2o*NCnTuMA-KaOeh{{A@8+&68YIC+lme~wPA1+6pX?CL~eiyYQ32p5g*Fzue4yXr@ z!epF=UR5f~sN~}|)M>cx+VSn!aI_yprS2eV&Cg+yu0y3btUVhJ^HKMAL=KF343*Ih zI19@#5sNt6da>~jkbhmUijFRL1U0i*&PW@~K|OE^Dl^5de;evSH&J^bvA`ay0%TRp zLezuaMcsD=t6`;%cEahX`v!OP>;vb~QHPFK+!x1C6Z;-hFujufD#d}MMFZACPMFC+t^G*X zUWw_n%TP;s50%;~UG1J~kGgLv7U4Ez6^vh@eQ~b?6H){-PV%exn^+CN@F^1!6Y>Hb@oBIl~B%TQvW>cSl8GO+do8vUprrCjPaC07& z`mEvBA*j7DAC-Z02I?7NFxPi?uafJQ9 z+TN%=@H}d->_JDHweu{w@Gur+_#$#*R$*83phPCintc}}H6Zi;~+2Aqug>tYi z?FnO8e?Kbhy`Rhfey;I`)c@$(99>g|iz^a(hz8I@o+47{+ktNqB+Vqy{tQ*tlz-Z# zVE*QwYio~<((k{@HevYpD92oVtK_hmP64MYt$sR`7d_|+B0^rwB9XiU6MtR(a&VEOugr3$5tsLmkc@whsEQ9|kO?b;vU zG*`cX@qG8HYwy8y;<{`91-HBUZj9pEQrFgxk>^K;N-*&f@jcO*s7eG7ZxJd%?mE?{ z>VpzX-}CqkF-IMgXm{PS)I*8M#1%p%m6%CPA!3N`djB{oDhr4o2p{n|afXN{`VlFF zN-hz>1Ll{v?1%p0S|x<|Cs9cJi};$jLG&S1o+D}!PZF;X=dTWpmx=a-ijP4b zu~oASbxb=FImA0eH=;VBa+F9TE)uPY`{e|c1fl^kiHKv&)mVX0`9>caIFc{Ez}JWa zL@VM2;vqsM*<$wMY2rho7WeeTNaB9+r*9pNL-#vyBr%Jqz;}Pe5bS~H2^H@}K7#2~ z8D9Qr%zv;Ykx2hqTu1~GcZhaGCHnu3mGO6&M+_yp5c>(0OGG20Cf9`Hqr_<9ETMA5 zQltFed4}0W`9F(&>*`{0>DKt^k)?%ow+5HSXEu+B$jWYz-PD(vnb){+z0B;=VfpJ~ PN}Kcw2rV5tuxiv#$s3|F delta 6568 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 diff --git a/po/ro.po b/po/ro.po index a16812b..acb222d 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.15.1\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2005-07-15 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -82,7 +82,7 @@ msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Încercaþi `%s --help' sau `%s --usage' pentru informaþii suplimentare.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Raportaþi bug-uri la %s.\n" @@ -91,17 +91,17 @@ msgstr "Raporta msgid "Unknown system error" msgstr "Eroare sistem necunoscutã" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 #, fuzzy msgid "give this help list" msgstr "Afiºeazã aceastã listã de ajutor" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 #, fuzzy msgid "give a short usage message" msgstr "Afiºeazã un scurt mesaj despre folosire" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NUME" @@ -114,11 +114,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 #, fuzzy msgid "print program version" msgstr "Afiºeazã versiunea programului" @@ -137,7 +137,7 @@ msgstr "%s: op msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -196,16 +196,16 @@ msgstr "%s: op msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opþiunea `-W %s' nu permite un argument\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "memorie epuizatã" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Nu pot schimba directorul în care lucrez" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Nu pot salva directorul în care lucrez" @@ -324,11 +324,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -530,104 +542,104 @@ msgstr "Sf msgid "Garbage command" msgstr "Comandã gunoi" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Aceasta nu pare a fi o arhivã tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Numãr total octeþi scriºi: %s (%s, %s/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Numãr total octeþi scriºi: %s (%s, %s/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Valoare invalidã pentru record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Nume arhivã nu a fost furnizat" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Nu pot verifica arhive atdin/stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiva este compresatã. Folosiþi opþiunea %s." -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Nu pot actualiza arhive comprimate" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "La începutul benzii, ieºim acum" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Prea multe erori, ieºim" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek nu s-a oprit la limita unei înregistrãri" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: conþine numãr volum invalid" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Depãºire domeniu numãr volum" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Preparã volum #%d pentru %s ºi apasã tasta return: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "EOF unde era aºteptat rãspunsul utilizatorului" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "AVERTISMENT: Arhiva este incompletã" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -639,70 +651,76 @@ msgstr "" " ! Lanseazã un subshell\n" " ? Afiºeazã aceastã listã de opþiuni\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Nici un volum nou; terminãm.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "`%s' comanda a eºuat" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s nu este continuat pe acest volum" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s este de dimensiune greºitã (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Acest volum este în afara secvenþei" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiva nu este etichetatã sã se potriveascã cu %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Volumul %s nu se potriveºte cu %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, 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:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek nu s-a oprit la limita unei înregistrãri" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -714,8 +732,8 @@ msgstr[1] "Am putut citi doar %lu din %lu octe msgid "Contents differ" msgstr "Conþinuturile diferã" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "EOF neaºteptat în arhivã" @@ -833,7 +851,7 @@ msgstr[1] "%s: Fi 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -862,7 +880,7 @@ msgstr "%s: fi msgid "%s: File removed before we read it" msgstr "%s: Fiºier ºters înainte de a-l putea citi" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 #, fuzzy msgid "directory not dumped" msgstr "%s: conþine o etichetã de director cache; nimic generat" @@ -914,170 +932,170 @@ msgstr "%s: Director redenumit msgid "Extracting contiguous files as regular files" msgstr "Extragem fiºiere contigue ca fiºiere normale" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Încerc extragerea link-urilor simbolice ca link-uri hard" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Citesc %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "EOF neaºteptat în numele amestecate" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, 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" -#: src/extract.c:1184 +#: src/extract.c:1181 #, fuzzy, c-format msgid "Current %s is newer or same age" msgstr "`%s' curent este mai nou" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Nu am putut arhiva (backup) acest fiºier" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: Nu pot redenumi ca %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Nu-mi pot reveni din eroare: termin acum" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Directorul a fost redenumit" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Directorul a fost redenumit" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Directorul este nou" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Înregistrare timp invalidã" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Mod invalid furnizat ca opþiune" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Numãr dispozitiv invalid" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Numãr inode invalid" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF neaºteptat în arhivã" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Nu curãþ director: nu pot determina statistici" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: ªtergem %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nu pot ºterge" @@ -1097,19 +1115,19 @@ msgstr "bloc %s: ** Bloc de NUL-uri **\n" msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Sfârºit de fiºier **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1117,68 +1135,68 @@ msgstr "" "lui doi" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiva conþine antete în baza-64 depãºite" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " link cãtre %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " tip fiºier necunoscut %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Link Lung--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Nume Lung--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Antet Volum--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continuat la octet %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Creez director:" @@ -1215,24 +1233,24 @@ msgstr "canal #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nu a fost gãsit în arhivã" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Lucrul cerut nu a fost gãsit în arhivã" @@ -1257,7 +1275,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1285,7 +1303,7 @@ msgstr "" " nil, existing numeroteazã dacã existã backup numerotat, altfel simplu\n" " never, simple întotdeauna creazã backup simplu\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1314,86 +1332,86 @@ msgstr "" " nil, existing numeroteazã dacã existã backup numerotat, altfel simplu\n" " never, simple întotdeauna creazã backup simplu\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Mod de operare principal:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "listeazã conþinutul unei arhive" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "extrage fiºiere dintr-o arhivã" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "creazã o nouã arhivã" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "gãseºte diferenþele dintre arhive ºi sistemul de fiºiere" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "adaugã fiºiere la sfârºitul unei arhive" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "adaugã numai fiºierele mai noi decât copia din arhivã" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "adaugã fiºiere tar la o arhivã" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "ºterge din arhivã (nu pe benzi magnetice!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Modificatori operaþie:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "manipuleazã eficient fiºierele rerefiate (sparse)" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "foloseºte vechiul format GNU pentru backup incremental" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FIªIER" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "foloseºte noul format GNU pentru backup incremental" -#: src/tar.c:407 +#: src/tar.c:409 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:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMÃR" -#: src/tar.c:409 +#: src/tar.c:411 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1406,306 +1424,306 @@ 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:415 +#: src/tar.c:417 #, fuzzy msgid "archive is seekable" msgstr "Arhiva este cãutabilã" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "încearcã sã verifici arhiva dupã scrierea sa" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "ºterge fiºierele dupã ce acestea sunt adãugate la arhivã" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "nu înlocui fiºierele existente la extragere" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "supra-scrie fiºierele existente la extragere" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "ºterge fiecare fiºier înainte de a extrage peste acesta" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "goleºte ierarhiile înainte de a extrage un director" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "pãstrazã metadata directoarelor existente" -#: src/tar.c:445 +#: src/tar.c:447 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "supra-scrie fiºierele existente la extragere" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "extrage fiºierele la ieºirea standard" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMANDÃ" -#: src/tar.c:456 +#: src/tar.c:458 #, fuzzy msgid "pipe extracted files to another program" msgstr "extrage fiºierele la ieºirea standard" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Manipulare atribute fiºiere:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "forþeazã NUME ca proprietar pentru fiºierele adãugate" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "forþeazã NUME ca grup pentru fiºierele adãugate" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATA-FIªIERULUI" -#: src/tar.c:472 +#: src/tar.c:474 #, 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:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "SCHIMBÃRI" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "forþeazã mod (simbolic) SCHIMBÃRI pentru fiºierele adãugate" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "nu extrage timpul de modificare al fiºierului" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "încearcã extragerea fiºierelor cu aceleaºi drepturi (ownership)" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "extrage fiºierele ca dvs. însuºi" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "foloseºte întotdeauna numere pentru numele utilizator/grup" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "sorteazã numele de extras sã se potriveascã cu arhiva" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "la fel ca -p ºi -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Selectare ºi schimbare unitate:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARHIVÃ" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "foloseºte fiºier arhivã sau unitate ARHIVÃ" -#: src/tar.c:513 +#: src/tar.c:515 #, 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:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "foloseºte rmt COMANDà în loc de rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "foloseºte remote COMANDà în loc de rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "specificã unitate ºi densitate" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "creazã/listeazã/extrage arhiva pe volume multiple" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "schimbã banda dupã scriere a NUMÃR x 1024 octeþi" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "ruleazã script la terminarea fiecãrei benzi (implicã -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "foloseºte/actualizeazã numãrul de volum în FIªIER" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Blocuri unitate:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOCURI" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCURI x 512 octeþi pe întregistrare" -#: src/tar.c:552 +#: src/tar.c:554 #, fuzzy msgid "NUMBER of bytes per record, multiple of 512" msgstr "DIMENSIUNE octeþi pe înregistrare, multiplu de 12" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorã blocuri zero-uate în arhivã (înseamnã EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "redimensioneazã bloc în timpul citirii (pentru pipe-uri BSD4.2" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Selecþie format arhivã:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 #, fuzzy msgid "create archive of the given format" msgstr "creazã arhiva de formatul dat." -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMAT este unul din urmãtoarele" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "vechiul format tar V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "oldgnu formatul GNU format ca pentru tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "formatul GNU tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formatul POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formatul POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 #, fuzzy msgid "same as pax" msgstr "ca ºi pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "ca ºi --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "ca ºi --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "cuvânt_cheie[[:]=valoare][,cuvânt_cheie[[:]=valoare], ...]" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "controleazã cuvintele cheie pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:587 +#: src/tar.c:589 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " @@ -1714,178 +1732,191 @@ msgstr "" "creazã arhivã nu nume volum NUME. La listare/extragere, foloseºte TEXT ca " "pattern de globbing" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Opþiunile de compresie sunt în conflict" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "filtrazã arhiva prin bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "filtreazã arhiva prin gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "filtreazã arhiva prin compress" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "filtreazã arhiva prin gzip" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "filtreazã arhiva prin gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "filtreazã prin PROG (trebuie sã accepte -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Selecþie fiºier local:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "DIR" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "schimbã în directorul DIR" -#: src/tar.c:619 +#: src/tar.c:626 #, 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:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T citeºte nume terminate cu null, deactiveazã cu -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "exclude fiºiere, date ca un PATTERN" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "pattern-urile de excludere sunt listate în FIªIER" -#: src/tar.c:631 +#: src/tar.c:640 #, 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:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:644 +#: src/tar.c:653 #, fuzzy msgid "exclude directories containing FILE" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "evitã coborârea automatã în directoare" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "stai în sistemul de fiºire local la creare arhivei" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "coboarã recursiv în directoare (implicit)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "nu elimina primul `/' din numele fiºierelor" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "NUME-MEMBRU" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "începe la membrul NUME-MEMBRU în arhivã" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "stocheazã numai fiºiere mai noi decât DATA-FIªIERULUI" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATA" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "comparã data ºi timpul numai când a fost schimbatã data" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "fã backup înainte de ºtergere, alege CONTROL pentru versiuni" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "ªIR" -#: src/tar.c:669 +#: src/tar.c:678 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -1894,95 +1925,95 @@ 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:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 #, 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:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 #, fuzzy msgid "ignore case" msgstr "în excluderi ignorã cazul caracterelor (minuscule/majuscule)" -#: src/tar.c:689 +#: src/tar.c:699 #, fuzzy msgid "patterns match file name start" msgstr "pattern-urile de excludere potrivesc începutul numelor de fiºiere" -#: src/tar.c:691 +#: src/tar.c:701 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "pattern-urile de excludere potrivesc dupã orice / (implicit)" -#: src/tar.c:693 +#: src/tar.c:703 #, fuzzy msgid "case sensitive matching (default)" msgstr "excluderea depinde de caz (minuscule/majuscule) (implicit)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "wildcard-urile în pattern-urile de excludere nu potrivesc '/'" -#: src/tar.c:701 +#: src/tar.c:711 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "wildcard-urile din pattern-urile de excludere potrivesc '/' (implicit)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Ieºire informativã:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "listeazã cu amãnunte fiºierele procesate" -#: src/tar.c:711 +#: src/tar.c:721 #, 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:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 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:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1990,28 +2021,28 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "afiºeazã datele de modificare a fiºierelor în UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "trimite ieºire detaliatã în FIªIER" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "aratã numãrul blocului din arhivã pentru fiecare mesaj" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "cere confirmare pentru fiecare acþiune" -#: src/tar.c:733 +#: src/tar.c:743 #, fuzzy msgid "show tar defaults" msgstr "Aratã valorire implicite folosite de tar" -#: src/tar.c:735 +#: src/tar.c:745 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " @@ -2020,88 +2051,88 @@ msgstr "" "La listare sau extragere, listeazã fiecare director care nu se potriveºte cu " "criteriile de cãutare" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Opþiuni compatibilitate:" -#: src/tar.c:753 +#: src/tar.c:763 #, 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:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Alte opþiuni:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Nu puteþi specifica mai mult de una dintre opþiunile `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Opþiunile de compresie sunt în conflict" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " tip fiºier necunoscut %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Fiºier date nu a fost gãsit" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Înlocuim %s pentru format de datã necunoscut %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, fuzzy, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Tratez data `%s' ca %s + %ld nanosecundã" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: fiºierul este în arhivã; nimic generat" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2109,152 +2140,166 @@ msgstr "" "\n" "*Acest* tar foloseºte implicit:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Factor blocuri invalid" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Avertisment: opþiunea -I nu este suportatã; aþi dorit cumva -j sau -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Lungime de bandã invalidã" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Mai mult de o singurã datã limitã" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Grup invalid" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Mod invalid furnizat ca opþiune" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Numãr invalid" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Proprietar invalid" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Dimensiune înregistrare invalidã" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Dimensiune înregistrare trebuie sã fie un multiplu de %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Numãr invalid de elemente" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "Argument densitate malformat: '%s'" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Densitate necunoscutã: '%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FIªIER]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Vechea opþiune `%c' necesitã un argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence n-are sens fãrã o listã de fiºiere" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence nu poate fi folosit în modul de operare cerut" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Fiºiere de arhivã multiple necesitã opþiunea `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Nu puteþi combina --listed-incremental cu --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Nu pot verifica arhive pe volume multiple" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Nu pot verifica arhive comprimate" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Nu pot folosi arhive comprimate pe volume multiple" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Nu pot actualiza arhive comprimate" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option poate fi folosit numai pentru arhive POSIX" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Refuz categoric sã creez o arhivã goalã" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opþiunile `-Aru' sunt incompatibile cu `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Trebuie sã specificaþi una din opþiunile `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Terminare cu eroare întârziatã de erori precedente" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2263,82 +2308,82 @@ 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:158 +#: src/xheader.c:156 #, fuzzy, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Cuvânt_cheie %s necunoscut sau încã neimplementat" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Pattern-ul %s nu poate fi folosit" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Cuvânt_cheie %s nu poate fi înlocuit (overridden)" -#: src/xheader.c:498 +#: src/xheader.c:496 #, fuzzy msgid "Malformed extended header: missing length" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 #, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "Antet extins malformat: lipseºte spaþiu liber dupã lungime" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:539 +#: src/xheader.c:537 #, fuzzy msgid "Malformed extended header: missing newline" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, fuzzy, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, fuzzy, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Antet extins malformat: lipseºte semnul egal" @@ -2505,97 +2550,107 @@ msgstr "Num msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Eroare sistem necunoscutã" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "%s: Nu pot cãuta (seek) cãtre %s" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " tip fiºier necunoscut %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Nu pot cãuta (seek) cãtre %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Amestecat numele fiºierelor--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2731,5 +2786,8 @@ msgstr "" #~ msgid "Error in writing to standard output" #~ msgstr "Eroare de scriere la ieºirea standard" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Terminare cu eroare întârziatã de erori precedente" + #~ msgid "Quitting now." #~ msgstr "Termin acum." diff --git a/po/ru.gmo b/po/ru.gmo index d652a8a6fe5b44fe3ffc2ae15673e2fe9bd6660e..f9ee2395a46e041ec8d923838db5cbf431258cfc 100644 GIT binary patch delta 10700 zcmZA72YgT0|Htw3C3Z+Cu_cH-60s6Qg2aj))RstM?@|1euNABIsy$nKr>bU+T1AVh zU9)IWRPECKU+?d^c|7{~-$y@rem>{k`@QF$bME~ne!nG)ye2L1a^J||HP2;?dCZSs zoatlCoHWKfD`bq?Ym~A^VSPf|V9bj{&<|%|dR&76xEcNN2lU1#j(_7s>WroBc{58J zw<%A$bDfg3i@usHgZGbSfi!D<+T>c|AFg6pvp-a=gr>PQneNeD?-tbhx#5}v}Ms5$8ZfvBOLi0bGv`~>%-I#!93YvRYK z3(rTjAH<4y7kx1|7t{GAktXA=N1_W2$HKT2bw}S~RlJIH+T`F<^ue{TA@)M8fv-{L zoptKxs44X3E_A0MSP(m-+DAI=tC7KTo3kVV?Dz*Y^!}B(7}muS*cLUXV;onai~11i z4v!$Gn)|3ln4kGk$BJM!tl=1g`rLM?wb2IyxxQKNH2i>!y2;FK%W9~R=!qJ#WMqAs zFEBU$h#Bw!a?|E1Mq|-XJ5oK6KAAbFHFOd+B3@y(gB384>zf!7-C=)Z0h^gv7x$q) zI4x)E!c|ds+y(W)$*4QtiyGp?m>+K;%fh@zb+8<_D=RyOqn?^*bZgOcAyEfbqE0-7 znu_PB4&<$2Ke#daQTISya5QS}m!Ud-(5WAz)>O7|+u;z*N!tn^i5ki=SP-|M&OePh{uX+niLj4fI!sHM1M{ID24IB< zw|y*H(2$FU1oX$@$aI>8s5?A|nei{wD*guxVPK@~SRIU|jzx8BEo#axpq`$8QSIex z*^aeGOV%1?JKuqI@g(Yv=UdzMyfWsYZid;h2Wrucz<3u^hdi;SXp|k9 z)~FjBj2giys3};49BSOVNFqtzVPUM!r)9y8r~`W- S!8se`|A9wh; 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 delta 10922 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 xF6|aN>kt^uB9Lk=gaY-{0LeAX?{V&VWXmJ1l diff --git a/po/ru.po b/po/ru.po index 349a609..901660e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.19\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2008-01-18 01:00+0200\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" @@ -83,7 +83,7 @@ msgstr "" "Попробуйте `%s --help' или `%s --usage' для получения дополнительной " "информации.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Отчеты об ошибках отправляйте на %s.\n" @@ -92,15 +92,15 @@ msgstr "Отчеты об ошибках отправляйте на %s.\n" msgid "Unknown system error" msgstr "Неизвестная системная ошибка" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "вывод этой справки" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "вывод короткого сообщения об использовании" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "ИМЯ" @@ -113,11 +113,11 @@ msgstr "определяет название программы" msgid "SECS" msgstr "СЕК" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "ожидание в течение заданных СЕКУНД (по умолчанию 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "вывод версии программы" @@ -135,7 +135,7 @@ msgstr "%s: Слишком много аргументов\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(ОШИБКА ПРОГРАММЫ) Опция должна была быть распознана?!" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -194,16 +194,16 @@ msgstr "%s: опция `-W %s' не однозначна\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: опция `-W %s' не разрешает использовать аргумент\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "память исчерпана" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Невозможно изменить рабочий каталог" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Невозможно сохранить рабочий каталог" @@ -322,11 +322,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[yY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -528,104 +540,104 @@ msgstr "Преждевременный конец файла" msgid "Garbage command" msgstr "Неверная команда" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Это не похоже на tar-архив" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Всего записано байт" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Всего прочитано байт" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Всего удалено байт: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Неверное значение для record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Не указано имя архива" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Невозможно проверить архив на stdin/stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архив сжат. Используйте опцию %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Невозможно обновить сжатые архивы" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Начало ленты, завершение работы" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Слишком много ошибок, завершение работы" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Размер записи = %lu блок" msgstr[1] "Размер записи = %lu блоков" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, 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:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Невозможно вернуться назад на один архивный файл; он может быть нечитаемым " "без -i" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не остановился на границе записи" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: содержит неверный номер тома" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Переполнение номера тома" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Приготовьте том Номер %d для %s и нажмите Enter: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Конец файла вместо ожидаемого ответа пользователя" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ПРЕДУПРЕЖДЕНИЕ: Архив не полный" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -637,65 +649,66 @@ msgstr "" " q Выход из tar\n" " y или [нов.строка] Продолжение операциия\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Порождение подпроцесса командного процессора\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Вывод этого списка\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Нет нового тома, завершение работы.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Не указано имя имя файла. Попробуйте ещё раз.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Неверные входные данные. Наберите ? для получения справки.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "Сбой команды %s" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s, возможно, продолжается на этом томе - в заголовке находится усечённое имя" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продолжается на этом томе" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s является неверным размером (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Этот том нарушает последовательность" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Метка архива не соответствует %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Том %s не соответствует %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -703,6 +716,11 @@ msgstr "" "%s: слишком длинное имя файла для сохранения в многотомном заголовке GNU; " "обрезано" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek не остановился на границе записи" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -714,8 +732,8 @@ msgstr[1] "Можно было прочитать только %lu байт из msgid "Contents differ" msgstr "Содержимое отличается" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Неожиданный конец файла в архиве" @@ -832,7 +850,7 @@ msgstr[1] "%s: Файл урезан на %s байт; дополнен нуля msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл находится на другой файловой системе; не сброшен" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "содержимое не сброшено" @@ -861,7 +879,7 @@ msgstr "%s: файл является архивом; не сброшен" msgid "%s: File removed before we read it" msgstr "%s: Файла удален до его считывания" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "каталог не сброшен" @@ -912,165 +930,165 @@ msgstr "%s: Каталог переименован до того, как мог msgid "Extracting contiguous files as regular files" msgstr "Непрерывные файлы извлекаются как обычные" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Выполняется попытка извлечь символические ссылки как жесткие" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Считывается %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Невозможно извлечь -- файл продолжается с другого тома" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Непредвиденный длинный заголовок имени" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Неизвестный тип файла `%c', извлечён как обычный файл" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Текущий %s более новый или такого же возраста" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Невозможно было выполнить резервное копирование этот файла" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Невозможно переименовать %s в %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Неисправимая ошибка: завершение работы" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталог был переименован из %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталог был переименован" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Каталог новый" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Неверная временная метка" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Неверное время изменения (секунды) " -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Неверное время изменения (наносекунды)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Неверный номер устройства" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Неверный номер inode" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Слишком длинное поле при чтении из snapshot-файла" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Ошибка чтения snapshot-файла" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Неожиданный конец файла snapshot-файле" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Неожиданное значения поля в snapshot-файле" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Отсутствует указатель конца записи" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Неверный формат инкрементного файла" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Неподдерживаемая версия инкрементного формата: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Неверно сформирован dump-каталог: ожидался '%c', а найден %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Неверно сформирован dump-каталог: 'X' повторяется" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Неверно сформирован dump-каталог: пустое имя в 'R'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Неверно сформирован dump-каталог: перед 'T' не стоит 'R'" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Неверно сформирован dump-каталог: пустое имя в 'T'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Неверно сформирован dump-каталог: ожидался '%c', а найден конец данных" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Неверно сформирован dump-каталог: 'X' ни разу не использован" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Невозможно создать временный каталог с помощью шаблона %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не удалён: невозможно выполнить stat" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог находится на другом устройстве: не удален" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Удаляется %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Невозможно удалить" @@ -1090,19 +1108,19 @@ msgstr "блок %s: ** Блок нулей **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Конец файла **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1110,68 +1128,68 @@ msgstr "" "дополнение до двух" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Восьмеричное значение архива %.*s за пределами диапазона %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Архив содержит устаревающие заголовки base-64" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Архив подписан строкой base-64 %s за пределами диапазона %s" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Значение архива %s за пределами %s диапазона %s..%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " ссылка на %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " неизвестный тип файла %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Длинная ссылка--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Длинное имя--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Заголовок тома--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продолжение с позиции %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Создание каталога:" @@ -1208,25 +1226,25 @@ msgstr "межпроцессорный канал" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "В именах файлов используются символы подстановки." -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" "Используйте --wildcards, чтобы задействовать эти символы, или --no-wildcards," -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "чтобы отключить вывод этого предупреждения." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Не найден в архиве" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Требуемое вхождение не найдено в архиве" @@ -1253,7 +1271,7 @@ msgstr "" "Неизвестный стиль цитирования `%s'. Воспользуйтесь `%s --quoting-style=help' " "для получения полного списка. " -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1272,7 +1290,7 @@ msgstr "" "архиве archive.tar.\n" " tar -xf archive.tar # Извлечение всех файлов из archive.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1293,87 +1311,87 @@ msgstr "" "простые\n" " never, simple всегда создавать простые резервные копии\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Основной режим работы:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "вывод списка содержимого архива" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "извлечение файлов из архива" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "создание нового архива" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "поиск различий между архивом и файловой системой" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "добавление файлов в конец архива" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "добавление в архив только более новых файлов" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "присоедининие tar-файлов к архиву" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "удаление из архива (не на магнитных лентах!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "проверка метки тома архива и выход" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Модификаторы:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "эффективная обработка разрежённых файлов" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "установить версию используемого формата разрежения (подразумевает --sparse)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "обработка добавочного резервирования старого формата GNU" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "обработка добавочного резервирования нового формата GNU" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "не завершать работу при ненулевом статусе для нечитаемых файлов" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1385,121 +1403,121 @@ msgstr "" "list, и когда список файлов задан либо в командной строке, либо через опцию -" "T. По умолчанию N равен 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "доступен поиск по архиву" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Управление перезаписью:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "попытка проверить архив после его записи" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "удаление файлов после их добавления в архив" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "не перезаписывать существующие файлы при извлечении" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "не перезаписывать существующие файлы, которые более новые, чем их копии в " "архиве" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "перезапись существующих файлов при извлечении" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "удаление каждого файла до извлечения поверх него" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "очистка всей иерархии до извлечения каталога" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "сохранение метаданных существующих каталогов" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "перезапись существующих файлов при извлечении (по умолчанию)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Выбор выходного потока:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "извлекать файлы на стандартный вывод" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "перенаправлять извлечённые файлы в другую программу" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "игнорировать коды завершения дочерних процессов" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "считать ненулевые коды завершения дочерних процессов как ошибку" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Обработка атрибутов файлов:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" "принудительно устанаваливать ИМЯ в качестве владельца для добавленных файлов" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" "принудительно устанаваливать ИМЯ в качестве группы для добавленных файлов" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "устанаваливать для добавленных файлов mtime из ДАТЫ-ИЛИ-ФАЙЛА" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "РЕЖИМ" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" "принудительно устанавливать (символьный) РЕЖИМ доступа для добавляемых файлов" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "СПОСОБ" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1509,29 +1527,29 @@ msgstr "" "после чтения (СПОСОБ='replace'; используется по умолчанию) или не установки " "времени в первую очередь (СПОСОБ='system')" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "не извлекать время изменения файла" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "попытаться извлечь файлы с тем же владельцем" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "извлекать файлы как свои собственные" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "использовать числа вместо имён владельца/группы" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "извлекать информацию о правах доступа к файлу (по умолчанию для " "суперпользователя)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1539,15 +1557,15 @@ msgstr "" "применять umask пользователя при извлечении прав доступа из архива (по " "умолчанию для обычных пользователей)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "сортировать извлекаемые имена в том же порядке, что и в архиве" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "эквивалент -p и -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1555,140 +1573,140 @@ msgstr "" "не устанавливать время изменения и права доступа извлечённых каталогов до " "завершения процесса извлечения" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "отменить действие опции --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Выбор и переключение устройств:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "АРХИВ" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "использовать файл или устройство АРХИВ" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "файл архива является локальным, даже если содержит двоеточие" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "использовать указанную КОМАНДУ rmt вместо rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "использовать удалённую КОМАНДУ вместо rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "указать устройство и плотность" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "создание/листинг/извлечение многотомных архивов" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "сменить ленту после записи ЧИСЛО x 1024 байт" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" "запустить скрипт по окончании каждой ленты (подразумевается использование -М)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "использовать/обновлять номера тома в ФАЙЛЕ" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Разбиение на блоки:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "БЛОКИ" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "число БЛОКОВ x 512 байт на запись" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ЧИСЛО байт на запись, кратное 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "игнорировать нулевые блоки в архиве (т.е. EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "заново разбивать на блоки при чтении (для каналов 4.2BSD)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Формата архива:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "создать архив в указанном формате" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "ФОРМАТОМ может быть:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "старый формат tar V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "формат GNU как в tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "формат GNU tar 1.13.х" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "эквивалент pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "эквивалент --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "эквивалент --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "keyword[[:]=значение][,keyword[[:]=значение]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "управляющие ключевые слова pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1696,85 +1714,98 @@ msgstr "" "создать архив с именем тома ТЕКСТ; при листинге/извлечении использовать " "ТЕКСТ в качестве шаблона подстановки" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Конфликт опций сжатия" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "пропустить архив через bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "пропустить архив через gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "пропустить архив через compress" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "пропустить архив через gzip" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "пропустить архив через gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "пропустить архив через ПРОГ (должна поддерживать -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Выбор локальных файлов:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "добавить указаный ФАЙЛ в архив (полезно, если имя начинается с дефиса)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "КАТАЛОГ" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "перейти в КАТАЛОГ" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "загрузить из ФАЙЛА имена для извлечения или создания" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T читает строки, оканчивающиеся нулём, отключает опцию -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "убрать кавычки с имён файлов, прочитанных с опцией -T (по умолчанию)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "не убирать кавычки с имён файлов, прочитанных с опцией -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "ШАБЛОН" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "исключать файлы, определённые ШАБЛОНОМ" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "исключать шаблоны, перечисленных в ФАЙЛЕ" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1782,90 +1813,90 @@ msgstr "" "исключать содержимое каталогов с файлом CACHEDIR.TAG за исключением самого " "файла с тегами" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "исключать всё содержимое каталогов, содержащих файл CACHEDIR.TAG" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "исключать каталоги, содержащие файл CACHEDIR.TAG" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "исключать каталоги, содержащие ФАЙЛ, за исключением самого ФАЙЛА" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "исключать всё содержимое каталогов, содержащих ФАЙЛ" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "исключать каталоги с ФАЙЛОМ" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "исключать каталоги CVS" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "отключить автоматический спуск в каталоги" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "оставаться в локальной файловой системе при создании архива" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "рекурсивный спуск по каталогам (по умолчанию)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "не удалять начальные `/' из имен файлов" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "следовать по символьным ссылкам и сохранять файлы, на которые они указывают" -#: src/tar.c:658 +#: src/tar.c:667 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "" "следовать по символьным ссылкам и сохранять файлы, на которые они указывают" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "ИМЯ-ЧЛЕНА" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "начинать с члена ИМЯ-ЧЛЕНА в архиве" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "сохранять только те файлы, которые новее ДАТЫ-ИЛИ-ФАЙЛА" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "сравнивать дату и время, только если изменены данные" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "УПРАВЛЕНИЕ" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "делать копию перед удалением, УПРАВЛЕНИЕ выбора версий" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "СТРОКА" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1873,93 +1904,93 @@ msgstr "" "делать копию перед удалением, переопределяет обычный суффикс ('~', если " "только он не переопределён переменной окружения SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Преобразвание имён файлов:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "удалять указанное ЧИСЛО начальных компонентов из имён файлов перед " "извлечением" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "РАСШИРЕНИЕ" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "использовать замену РАСШИРЕНИЯ sed'ом для преобразования имён файлов" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Параметры шаблонов подстановки для имён файлов (вляют на шаблюны включения и " "исключения):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "игноририровать регистр" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "шаблоны начала имени файла" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "шаблоны после любого '/' (по умолчанию для исключаемых)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "с учётом регистра (по умолчанию)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "использовать маски (по умолчанию для исключаемых)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "точное соответствие строке" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "маски не соответствуют '/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "маски соответствут '/' (по умолчанию для исключаемых)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Вывод информации:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "подробный листинг обрабатываемых файлов" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "вывод сообщений о ходе выполнения через каждые ЧИСЛО записей (по умолчанию " "10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "вывод сообщений, если сохранены не все ссылки" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1971,27 +2002,27 @@ msgstr "" "SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2. Также разрешается использовать имена без " "префикса SIG" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "вывод даты изменения файла в формате UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "отправить подробный вывод данных в FILE" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "выводить номера блоков архива в каждом сообщении" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "запрашивать подтверждение для каждого действия" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "показать значения tar по умолчанию" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -1999,31 +2030,31 @@ msgstr "" "при выводе листинга или извлечении показывать все каталоги, не " "соответствующем условию поиска" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "показывать имена файлов или архивов после преобразования" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "установить стиль цитирования имён. Значения для СТИЛЯ см. ниже" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "дополнительно цитировать символы из СТРОКИ" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "отключить цитирование символов из СТРОКИ" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Опции совместимости:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2031,56 +2062,56 @@ msgstr "" "при создании, эквивалент --old-archive; при извлечении, эквивалент --no-same-" "owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Другие опции:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "отключить использование некоторых потенциально опасных опций" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Указать можно не более одной опции `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Конфликт опций сжатия" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Неизвестное название сигнала: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Файл с образцом даты не найден" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s заменяется на неизвестный формат даты %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Опция `%s': дата '%s' рассматривается как %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: список файлов уже прочитан" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: в прочитанном имени файла присутствует пустой символ" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Допустимые агрументы для опций --quoting-style:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2088,152 +2119,166 @@ msgstr "" "\n" "Значения по умолчанию *этого* tar:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Неверный размер ёмкости блока" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" "Предупреждение: опция -I не поддерживается; может имелась в виду -j или -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Неверная длина ленты" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Больше одной пороговой даты" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Неверное значение версии разрежения" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' не поддерживается на этой платформе" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "значение --checkpoint не явлется целым числом" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Неверная группа" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "В опции указан неверный режим доступа" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Неверное число" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Неверный владелец" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Неверный размер записи" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Размер записи должен быть кратен %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Неверное число элементов" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Разрешается использовать только одну опцию --to-command" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Неверно сформирован аргумент плотности: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Неизвестная плотность: '%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Опции `-[0-7][lmh]' не поддерживаются *этим* tar'ом" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Для старой опции `%c' нужно указать аргумент." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence бесполезна без списка файлов" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence не может быть использована запрошеном режиме работы" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Для нескольких файлов архивов требуется опция `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Нельзя комбинировать --listed-incremental с --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Невозможно проверить многотомные архивы" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Невозможно проверить сжатые архивы" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Невозможно использовать многотомные сжатые архивы" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Невозможно объединить сжатые архивы" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option может быть использована только с архивами POSIX" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Робкий отказ от создания пустого архива" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Опции `-Aru' не совместимы с `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Вы должны указать одну из опций `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Выход, отложенный по результатам предыдущих ошибок" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2242,54 +2287,54 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Файл урезан на %s байт" msgstr[1] "%s: Файл урезан на %s байт" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Неизвестное или ещё не реализованное ключевое слово %s" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Шаблон %s не может быть использован" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ключевое слово %s не может быть перекрыто" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Неверно сформирован расширенный заголовок: отсутствует длина" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Длина расширенного заголовка за пределами допустимого диапазона" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "Длина расширенного заголовка %*s за пределами допустимого диапазона" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" "Неверно сформирован расширенный заголовок: после длины отсутствует пробел" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Неверно сформирован расширенный заголовок: отсутствует знак равенства " -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" "Неверно сформирован расширенный заголовок: отсутствует знак новой строки" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Игнорируется неизвестное клоючевое слово расширенного заголовка `%s'" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2298,29 +2343,29 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Расширенный заголовок %s=%s за пределами диапазона %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Неверно сформирован расширенный заголовок: неверный %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Неверно сформирован расширенный заголовок: превышен %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Неверно сформирован расширенный заголовок: неверный %s: непредвиденный " "разделитель %c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2497,105 +2542,122 @@ msgstr "Число за пределами допустимого диапазо msgid "Negative size: %s" msgstr "Отрицательный размер: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "Сбой stat(%s)" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Ошибка разбора числа возле `%s'" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Неизвестный формат даты" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[АРГУМЕНТЫ...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "невозможно открыть `%s'" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "невозможно найти" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "в имени файла присутствует пустой символ" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "невозможно вывести разрежённые файлы на стандартный вывод; используйте опцию " "--file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "неверная маска (возле `%s')" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Неизвестное поле `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "невозможно установить время в `%s'" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Команда успешно выполнена\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Сбой команды; состояние: %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Команда завершена по сигналу %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Команда остановлена по сигналу %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Команда сбросила дамп памяти\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Команда завершена\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "для опции --stat нужны имена файлов" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "слишком много аргументов" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "отменить действие опции --delay-directory-restore" + #~ msgid "[.]NUMBER" #~ msgstr "[.]ЧИСЛО" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Выход, отложенный по результатам предыдущих ошибок" + #~ msgid "block size" #~ msgstr "размер блока" diff --git a/po/sk.gmo b/po/sk.gmo index 17d033a83a434d49218001c7edfd7b43742bfa0d..e142a50d5f5245d78e9dda70ff18003900088da0 100644 GIT binary patch delta 2991 zcmYk+drXye9LMqRk)y}~0p*THM-&nTxd_1oMZDmo60aa)W@VU}m>2Rw_JEpQ6d_MF zt64cKueI9Ax!lakSz4)Sn}4*CmW*tzHfMD4A9{ZdPg~E<_j&z(&v~BT<@@_R&xZ}S zmpVTT@xE*vyNO}MQLotI~Dn{XuV!9jQu_59bEi#PC2OyCGM!wZxJ?e&L9EwL#Gd+vSNH?m(fvlVAg{X|x zpgP)wYG*H!L_3KZ@Oh*wyN!N~P9*=7EtiE-L(@>HT!wm}4Vko^zykaR)nG5`{up*p zB<3SOo4`r!%}2&)D^L?`LAH_YMGfGH>!~F2PqyqkE@+0`$g-K2ofU-%s0Pwe4VNQ7 zo6kx2HKGRWpfdIjDl=CwAN#S6dae*dOMx126Y9BEhXQ@t0n|WFp;CSsX~TX;4J4d* zNB6~}8p=jxq839LLvFP;)Mh(?>ga-d{d-hK{&0<;lW^)z8U=Nj$%(AmWYp_dhf{F_ zj>D5U7H^^l{iG$78BRXx<*4VX-0RCxDc_FT3ooGt@DVZwJBMV@u`UYQJU#9WDXc?( z>SIxFLm{exQdElTv4IinM0IeBUX>XSH)#MVsP;;bPk=3Q>npIBdOK<_eTn1s{@qnk_}mUqqz_w%>gYAp|7Ve( z^>R`>qv%!jSxEM6BWg)s&m#Z&;}940p}CBjK^N-vi=m>Kj6!{omY|lR4Yk&%u?(-E z);f-tUjs`=y?)b??PYUO6J3k?9<-tM(0+%4IzEni{m!9Md(FL}2esxA^sdxrqdJ;_ zYIp(ab=u(mA3#0-0s8R_>O<6x6_`w#G=YVvP3m+|D5P)@2Vo~_2EU>l1+B$;4849B zL;Wyn#3$VAzhHmr1KFtqFdDUY60j5}q6VN&b!eS86Eg@sr!13Hd!Ar5>_y@QjY!9C zqK;6?Hxf#b6F3wxBB7Cz4nB7_CsZ<99r!U~=(Hu&lp!74`v{$fa9-fn*Pte&jPxTO zARZxB5YG{tUZ$!>o>e>Q2RuY?t`-oU#Cec7VOiUu?20rr*&Dcswhti-F zJV@L_tS5BrAm#@=kx4}lQPMu{Aaqm{EReMj+lXdD`*J$5lX#366KM6tRkTs6Czcc1 z2ihz1h(*M`#9%^48F4?cOO^i}PXzWw#yO93Wf@UJEGBA+EJ9zG5@I&--=S~h6oU1( z4a8G~j!Hs1Z>cIA&k$^3^Ab(O(}Z?#IiVd{Oz2ppfj>!M9q}mfEHR5{56+01>I)uA q9PSPFq}GH*=NIG@6#Mh?#upZj$twufrLBqz{yh4OH`tjwFYI4r86|N5 delta 3165 zcmYk-eN0t#9LMn=iV}#5ppf9hA%sBVN#wz&QuASoN|q)nhF3UOK)4sUK!WCl(umA3 zueO<)md;hnoU+WVEFW@a>S}HL;Y!nHO>N|+mdn<|`va$~Grs5bJLjJBJKx{;_dAFC zrH9=9%aOs`4cj(i81ZSaF{iO8lpR}jxH0^h8g|jR9v{N(I0}zqf4qdc{})Wh2RJzr z^Kc>-Vk~aML3j{jjPaWjG=^~EB1YgX9D!zlF@s?wPQY=f2YXQ+Y{dt0AM#9d49DVE zn1Fww5{@6((_bFy{>6?>7{T++F6V*|F_Q}}pgQ;m<1vA(hT;szVtj<-MjVd&F%iFT z&fmmTj$_Eu!Wo!^Zj8jusLJe-Jl`Cr5rkK;FaC&n;0@Fbz1gK;G-l%zR00jCj`rdh zJcTpy7G_~ilrf{R0=uUSb^lS!z+cg?IU7lxAH_+i4%ebC*okp?9yQYIsEYJuzVyIk z)bT=8#Trl#dIQzZF{Fs*5-Q;?(|4AYAh zGZqJaRu!D~YO^IMhhfkZCk? zF&vkpI;cQ(+=~2}UF>w-5mdrwP?hUKRcHkBn2B>x_pL)s$yQXt$NV&O<5?sra|@M7 z2=9tYAB*&5a!`pBpsp)IbySC{#BS`a80zimM7lC}QHyT?o#}zusPj`%mGLig8r2xW ziH*pg+02froA*#19>?kU17_hU%8`bJ7=*2;3bnBd!~LlH4msz)L6yD>wKo1l67ZWi z>P?a+169g=)M6?^W!Q{;a69Vl*oo@k9aO1LqMHovpdPT4A620;R07SY{&pju1arzc z{uXof{{K!xiz?0P`OvsfrF;`L6(>=PtP}Mb-a|boo|6>Aq@&hQKF+~n)YQC>y1x^Z z&~;P-dPQC3Mp^+r9%f>m#Po^1_*j`jZ7aVV( z2G)n~G)15#+PeYuJDq zNjqw4&Y(U}Kcl83ikDtI-a?Jw3Tm}R zr|~Zr)3865phi%GT4b-I5<84qTxU_G?LvK!hNSmYC=n^HnU1QU2h~q2^7{JC2Q*ZH zOUS+E9;!r1{HhU*MI|&3H3Az$u?aQO4X8x+p@pB|Qv4n@_qhy{*)bjr!X2nJvJ*q~ z{-2$$p=}$XQK|H6300^i&=#67#7j#XpFi_dcgvXCz=_bf z87_`gA#E@9V4lTDVu^F?Lk&h1=|!v{+(aeuGVwwnJ}fL)DL{t!32U;tOh~>mwVi2KCm41fUqJ#f!HG!6XQT{5< zlo16)F;Pfp+3IVPM?6XVw`I|IoM4@pCSpCIO<$^IgslU%RzfQ{m}nrH39aDA2(8Fm zLR+;GUqhpwC@0#81;lF|DdE$@;_Wr%bylfe>1wn~EqATA%Brrl8_K=)KFhAH_15}2 z+|kLw!^+BiR)e>)zRI>}dF$&euiNt3HTAZqq+?U;lHLO{#-(PCvofF7tLIrZ4LKFRnIac>n+a diff --git a/po/sk.po b/po/sk.po index 6375446..56768df 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar- \n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2002-02-10 12:00CEST\n" "Last-Translator: Martin Lacko \n" "Language-Team: Slovak \n" @@ -81,7 +81,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Viac informácií získate príkazom `%s --help'.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, fuzzy, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -94,15 +94,15 @@ msgstr "" msgid "Unknown system error" msgstr "Neznáma systémová chyba" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -115,11 +115,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -137,7 +137,7 @@ msgstr "%s: prep msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -196,16 +196,16 @@ msgstr "%s: prep msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: prepínaè `-W %s' musí by» zadaný bez argumentu\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "Pamä» vyèerpaná" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Pracovný adresár nie je mo¾né zmeni»" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Pracovný adresár nie je mo¾né uchova»" @@ -325,11 +325,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -533,103 +545,103 @@ msgstr "Pred msgid "Garbage command" msgstr "Neznámy príkaz" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Toto pravdepodobne nie je tar archiv" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "Celkom zapísané bajtov: %s (%sB, %sB/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Celkom zapísané bajtov: %s (%sB, %sB/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(rúra)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Chybná hodnota pre veµkos» záznamu" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Meno archívu nebolo zadané" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Stdin/Stdout archív nie je mo¾né otvori»" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Komprimovaný archív nie je mo¾né aktualizova»" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Páska na zaèiatku, konèím" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Príli¹ mnoho chýb, konèím" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: vracia chybné èíslo zväzku" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Èíslo zväzku preteèené" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Namiesto u¾ívateµskej odpovede bol zadaný koniec súboru" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "VAROVANIE: Archiv je nekompletný" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -641,69 +653,74 @@ msgstr "" " ! Vytvorenie podshellu\n" " ? Vypísanie tejto nápovedy\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Nie je nový zväzok; konèím.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "'%s' príkaz zlyhal" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s nepokraèuje na tomto zväzku" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je chybnej då¾ky (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, 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:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Pre vyhodnotenie vzorky `%s' musí by» archív pomenovaný" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Zväzok %s nezodpovedá vzorke %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, fuzzy, c-format msgid "Could only read %lu of %lu byte" @@ -715,8 +732,8 @@ msgstr[1] "D msgid "Contents differ" msgstr "Obsah sa lí¹i" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Neoèekávaný koniec archívu" @@ -833,7 +850,7 @@ msgstr[1] "%s: S 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -862,7 +879,7 @@ msgstr "%s: s msgid "%s: File removed before we read it" msgstr "%s: Súbor zmazaný skôr ako mohl by» èítaný" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -914,168 +931,168 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "Súvisle ulo¾ené súbory rozbaµujem ako obyèajné súbory" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Skú¹am rozbali» symbolické odkazy ako pevné odkazy" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Èítanie z %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "Neoèakávaný koniec v rozsekanom mene" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, 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" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Tento súbor nebolo mo¾né zálohova»" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s: nie je mo¾né premenova» na %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Z chyby sa nie je mo¾né zotavi»: ukonèuje sa" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Adresár bol premenovaný" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Adresár bol premenovaný" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Adresár je nový" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Neplatný èas súboru" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Zadáné chybné práva" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Neplatné èíslo zariadenia" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Neplatné èíslo i-uzlu" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekávaný koniec archívu" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, 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:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Ma¾em %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nedá sa zmaza»" @@ -1095,19 +1112,19 @@ msgstr "blok %s: ** Blok NUL **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec súboru **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1115,68 +1132,68 @@ msgstr "" "complement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Archív obsahuje zastaralé base-64 hlavièky" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " odkaz na %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " neznámy typ súboru %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Hlavièka zväzku--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Pokraèované od %s bajtu--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Vytváram adresár:" @@ -1213,24 +1230,24 @@ msgstr "meziprocesov #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: V archíve nenájdený" -#: src/names.c:621 +#: src/names.c:615 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: V archíve nenájdený" @@ -1255,7 +1272,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1274,7 +1291,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:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1300,87 +1317,87 @@ msgstr "" " existujú, inak tvorí jednoduché\n" " never, simple tvorí v¾dy jednoduché zálo¾né kópie súborov\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 #, fuzzy msgid "create a new archive" msgstr "Neoèekávaný koniec archívu" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1388,559 +1405,572 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 #, fuzzy msgid "extract files to standard output" msgstr "Chyba pri zápise na ¹tandardný výstup" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Víczväzkový archív nie je mo¾né otvori»" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 #, fuzzy msgid "Archive format selection:" msgstr "Odporujúce si archívne formáty" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Odporujúce si kompresné prepínaèe" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:602 +#: src/tar.c:607 #, fuzzy msgid "filter the archive through compress" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "%s: súbor je archiv; nearchivovaný" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 #, fuzzy msgid "change to directory DIR" msgstr "Pracovný adresár nie je mo¾né zmeni»" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Odstraòujem úvodné `%.*s' z názvov súborov" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "Zväzok %s nezodpovedá vzorke %s" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1948,269 +1978,283 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Viac ako jeden prepínaè `-Acdtrux' nemô¾e by» zadaných" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Odporujúce si kompresné prepínaèe" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " neznámy typ súboru %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Dátumový súbor nebol nájdený" -#: src/tar.c:997 +#: src/tar.c:1017 #, 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:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Neplatný poèet bajtov na záznam" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" "Varovanie: prepínaè -I nie je podporovaný; pravdepodobne budete chcie» " "pou¾i» -j alebo -T!" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Neplatná då¾ka pásky" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Viac ako jeden poèiatoèný dátum" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Chybná skupina" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Zadáné chybné práva" -#: src/tar.c:1738 +#: src/tar.c:1775 #, fuzzy msgid "Invalid number" msgstr "Neplatné èíslo i-uzlu" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Neplatný vlastník" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Chybná veµkos» záznamu" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Veµkos» záznamu musí by» násobok %d." -#: src/tar.c:1834 +#: src/tar.c:1873 #, fuzzy msgid "Invalid number of elements" msgstr "Neplatná då¾ka pásky" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Prepínaè `%c' vy¾aduje argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Viac archivaèných súborov vy¾aduje prepínaè `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental a --newer nie je mo¾né kombinova»" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Víczväzkový archív nie je mo¾né otvori»" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Komprimovaný archív nie je mo¾né otvori»" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Viaczväzkový komprimovaný archív nie je mo¾né vytvori»" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Komprimovaný archív nie je mo¾né aktualizova»" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Vytvorenie prázdneho archívu odmietnuté." -#: src/tar.c:2343 +#: src/tar.c:2389 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:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Musíte zada» jeden z prepínaèov `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Za behu programu nastala chyba" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, fuzzy, c-format @@ -2219,79 +2263,79 @@ 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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2454,97 +2498,107 @@ msgstr " msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Neznáma systémová chyba" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Nedá sa zatvori»" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " neznámy typ súboru %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s: Nedá sa zmeni» pozícia v súbore na %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Potomok bol ukonèený signálom %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Rozdelené meno súboru--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -3009,6 +3063,9 @@ msgstr "" #~ msgid "Written by John Gilmore and Jay Fenlason." #~ msgstr "Autori: John Gilmore a Jay Fenlason." +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Za behu programu nastala chyba" + #~ msgid "" #~ "If a long option shows an argument as mandatory, then it is mandatory\n" #~ "for the equivalent short option also.\n" diff --git a/po/sl.gmo b/po/sl.gmo index b78f86d93e242693917b39c73d066304ce9a3c17..662e306f6853f8d86bcb8f286de2d7808681a6f0 100644 GIT binary patch delta 8213 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 WmQh|gq-9Kb-rT_8@(Iq7sQ&=#RmBYe delta 8395 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\n" "Language-Team: Slovenian \n" @@ -83,7 +83,7 @@ msgstr " [IZBIRA...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Poskusite »%s --help« ali »%s --usage« za izčrpnejÅ¡a navodila.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Poročila o napakah javite na %s.\n" @@ -92,15 +92,15 @@ msgstr "Poročila o napakah javite na %s.\n" msgid "Unknown system error" msgstr "Neznana sistemska napaka" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "poda ta seznam pomoči" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "poda kratka navodila za uporabo" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "IME" @@ -113,11 +113,11 @@ msgstr "nastavi ime programa" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "premor SEK sekund (privzeto 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "izpis izdaje programa" @@ -135,7 +135,7 @@ msgstr "%s: Preveč argumentov\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(PROGRAMSKA NAPAKA) Izbira bi morala biti prepoznana?!" -#: lib/closeout.c:73 +#: lib/closeout.c:112 #, fuzzy msgid "write error" msgstr "Pisanje zapisa\n" @@ -195,16 +195,16 @@ msgstr "%s: izbira »-W %s« je dvoumna\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "zmanjkalo pomnilnika" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Ni mogoče izvedeti trenutnega imenika" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Delovnega imenika ni mogoče shraniti" @@ -330,11 +330,23 @@ msgstr "»" msgid "'" msgstr "«" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[dDjJ]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -535,67 +547,58 @@ msgstr "Predčasen znak za konec datoteke" msgid "Garbage command" msgstr "Neveljaven ukaz" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "To ne deluje kot arhiv ,tar'" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Skupno zapisanih bajtov" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Skupno prebranih bajtov" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Skupno izbrisanih bajtov: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(cev)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Neveljavna vrednost za dolžino zapisa (record_size)" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Ime arhiva ni podano" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Arhivov na stdin/stdout ni mogoče preveriti" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiv je stisnjen. Uporabite izbiro %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Stisnjenega arhiva ni mogoče ažurirati" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Na začetku traku, končujem" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Preveč napak, končujem" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "Neporavnan blok (%lu bajtov) v arhivu" -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:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -604,37 +607,46 @@ msgstr[1] "Dolžina zapisa = %lu blok" msgstr[2] "Dolžina zapisa = %lu bloka" msgstr[3] "Dolžina zapisa = %lu bloki" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "Neporavnan blok (%lu bajtov) v arhivu" +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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek se ni ustavil na meji zapisa" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: vsebuje neveljavno Å¡tevilko dela" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Prekoračitev Å¡tevilke dela" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Pripravite del #%d za %s in pritisnite Return: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Znak EOF na mestu, kjer se pričakuje odgovor uporabnika" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "POZOR: Arhiv nepopoln" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -645,64 +657,65 @@ msgstr "" " q Končamo tar\n" " y, newline Nadaljujemo z delovanjem\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Poženemo ukazno podlupino\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Ta seznam uzazov\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Novega dela ni, konec.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Neveljaven vnos. Vtipkajte ? za pomoč.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "ukaz %s neuspeÅ¡en" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s se ne nadaljuje v tem delu" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je napačne velikosti (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ta del ne sodi v zaporedje" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiv ni označen skladno z %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Del %s ne ustreza %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -710,6 +723,11 @@ msgstr "" "%s: ime datoteke je predolgo za zapis v zaglavje GNU večdelnega arhiva; " "porezano" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "Arhiv %s se ne konča s koncem bloka" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -723,8 +741,8 @@ msgstr[3] "Prebrati je bilo moč samo %lu od %lu bajtov" msgid "Contents differ" msgstr "Vsebina se razlikuje" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Nepričakovan znak za konec datoteke v arhivu" @@ -846,7 +864,7 @@ 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "vsebina ni izneÅ¡ena" @@ -875,7 +893,7 @@ msgstr "%s: datoteka je arhiv; brez iznosa" msgid "%s: File removed before we read it" msgstr "%s: Datoteka je bila odstranjena, preden smo jo prebrali" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "imenik ni iznaÅ¡en" @@ -929,167 +947,167 @@ msgid "Extracting contiguous files as regular files" msgstr "Neprekinjene datoteke izvlečemo kot navadne" # POZOR! Grdo! -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Simbolne povezave poskusimo dearhivirati kot trde" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Branje %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Nepričakovano zaglavje z dolgim imenom" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Neznana vrsta datoteke »%c«, dearhiviramo kot navadno datoteko" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Obstoječa »%s« je novejÅ¡a ali enako stara" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Varnostne kopije te datoteke ni moč napraviti" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Preimenovanje %s v %s ni mogoče" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Napake ni moč popraviti: zapuščamo" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Imenik je bil preimenovan z %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Imenik je bil preimenovan" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Imenik je nov" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Neveljavna oznaka časa" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Neveljaven čas spremembe (sekunde)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Neveljaven čas spremembe (nanosekunde)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Neveljavna Å¡tevilka enote" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Neveljavna Å¡tevilka inoda" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Predolgo polje pri branju trenutnega posnetka" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Napaka pri branju trenutnega posnetka" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Nepričakovan znak za konec datoteke v trenutnem posnetku" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Nepričakovana vrednost polja v trenutnem posnetku" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Manjkajoč zaključek zapisa" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Okvarjen inkrementalni zapis datoteke" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nepodprta različica inkrementalnega zapisa: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Okvarjen argument gostote: »%s«" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Okvarjen argument gostote: »%s«" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ni mogoče rezervirati pomnilnika za bločni faktor %d" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Imenika ne čistimo: statistika zanj ni dosegljiva" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: BriÅ¡emo %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Odstranitev ni mogoča" @@ -1109,87 +1127,87 @@ msgstr "blok %s: ** Blok znakov NUL **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec datoteke **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:717 +#: src/list.c:726 #, 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" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "OsmiÅ¡ka vrednost arhiva %.*s izven obsega %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiv vsebuje zastarele glave oblike base-64" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiv vsebuje %.*s na mestu, kjer pričakujemo Å¡tevilčno vrednost %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " povezava na %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " neznan tip datoteke %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Dolga povezava--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Dolgo ime--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Glava dela--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Nadaljevanje pri bajtu %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Ustvarjamo imenik:" @@ -1226,24 +1244,24 @@ msgstr "medprocesni kanal" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ni najdeno v arhivu" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Zahtevane pojavitve ni moč najti v arhivu" @@ -1269,7 +1287,7 @@ msgid "" msgstr "" "Neznan slog narekovajev »%s«. Poskusite »%s --quoting-style=help« za seznam." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1290,7 +1308,7 @@ msgstr "" " tar -xf arhiv.tar # Izvlečemo vse datoteke iz arhiva arhiv." "tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1313,86 +1331,86 @@ msgstr "" " sicer enostavne\n" " never, simple vedno enostavne varnostne kopije\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Glavni načini delovanja:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "izpis vsebine arhiva" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "izvlečenje datoteke iz arhiva" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "ustvarjanje novega arhiva" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "iskanje razlik med arhivom in datotečnim sistemom" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "dodajanje datotek na konec arhiva" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "dodajanje novih datotek, če so novejÅ¡e od že arhiviranih" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "zlivanje arhivov" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "brisanje datotek iz arhiva (ne deluje na traku!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Določila delovanja:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "ekonomično ravnanje z razprÅ¡enimi datotekami" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "stari zapis GNU za inkrementalne arhive" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "DATOTEKA" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "novi zapis GNU za inkrementalne arhive" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "nadaljuj z branjem, tudi če datoteke ni moč prebrati" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:409 +#: src/tar.c:411 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1405,118 +1423,118 @@ msgstr "" "list, pri čemer je seznam datotek podan bodisi v ukazni vrstici, bodisi z " "izbiro -T. Privzeta vrednost N je 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "po arhivu je mogoče iskati" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Nadzor nad pisanjem prek:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "s poskusom preverjanja zapisanega arhiva" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "pobriÅ¡i datoteke, potem ko so arhivirane" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "pri izvlačenju ne piÅ¡i prek obstoječih datotek" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "pri izvlačenju piÅ¡i prek obstoječih datotek" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" "s poprejÅ¡njim brisanjem obstoječih datotek pri izvlačenju istoimenskih novih" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "izprazni hierarhije pred izvlačenjem imenikov" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "ohrani metainformacije o obstoječih imenikih" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "pri izvlačenju piÅ¡i prek metapodatkov obstoječih imenikov (privzeto)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Izbira izhodnega toka:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "datoteke izvleci na standardni izhod" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "UKAZ" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "datoteke napelji na vhod drugega programa" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "prezri izhodne kode hčerinskih procesov" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "obravnavaj neničelne izhodne kode hčerinskih procesov kot napako" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Ravnanje z atributi datotek:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "pri dodajanju datotek spremenimo lastnika v IME" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "pri dodajanju datotek spremenimo skupino v IME" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATUM-ČAS" -#: src/tar.c:472 +#: src/tar.c:474 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "shrani le datoteke, novejÅ¡e od DATUM-ČAS" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "SPREMEMBE" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "zahtevaj (simbolne) SPREMEMBE zaščite za dodane datoteke" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "METODA" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1526,29 +1544,29 @@ msgstr "" "branju (METODA=replace, privzeto) ali tako, da se časa sploh ne nastavi " "(METODA=system)" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "brez izvlačenja časa spremembe" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "z ohranitvijo lastniÅ¡tva, če je mogoče" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "pri izvlačenju prepiÅ¡emo lastniÅ¡tvo nase" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "s Å¡tevilčnimi vrednostmi UID/GID namesto imen" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "izvleci podatke o dovoljenjih za dostop do datotek (privzeto za " "administratorja)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1556,15 +1574,15 @@ msgstr "" "uporabi uporabnikovo masko umask pri izvlačenju dovoljenj za dostop do " "datotek (privzeto za uporabnike)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "imena razvrstimo tako, da se ujemajo z arhivom" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "isto kot -p in -s skupaj" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1572,140 +1590,140 @@ msgstr "" "počakaj do končanega izvlačenja, preden nastavimo čase sprememb in " "dovoljenja za dostop za izvlečene imenike" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "prekliči učinek izbire --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Izbira enote in preklapljanje:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARHIV" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "uporabi datoteko ali enoto ARHIV" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "arhiv je lokalen kljub dvopičju v imenu datoteke" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "uporabi navedeni UKAZ rmt namesto rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "uporabi nelokalen UKAZ namesto rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "določi enoto in gostoto zapisa" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "ustvari/pregledaj/izvleci arhiva v več delih" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "menjava traku po Å T x 1024 zapisanih bajtih" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "poženi SKRIPT po koncu traku (privzema -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "uporabimo/ažuriramo Å¡tevilo dela v DATOTEKI" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Bločna razdelitev enote:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOKI" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "dolžina zapisa BLOKI × 512 bajtov" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "Å TEVILO bajtov v zapisu (večkratnik 512)" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ne meni se za bloke ničel (EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "razdeli na bloke ob branju (cevovodi 4.2BSD)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Izbira oblike arhiva:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "OBLIKA" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "ustvari arhiv v navedeni obliki" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "OBLIKA je nekaj od naÅ¡tetega:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "oblika starega V7 tar" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "stara oblika GNU tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "oblika GNU tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "oblika POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "oblika POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "isto kot pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "isto kot --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "isto kot --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ključna-beseda[[:]=vrednost][,ključna-beseda[[:]=vrednost],...]" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "krmilne ključne besede pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "VZOREC" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1713,180 +1731,193 @@ msgstr "" "ustvari arhiv z imenom dela IME; pri izpisu seznama/izvlečku je lahko IME " "regularni izraz za ime dela" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Nasprotujoče si izbire glede stiskanja arhiva" -#: src/tar.c:594 +#: src/tar.c:596 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Pisanje na vhod programa za stiskanje ne gre" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "filtriraj arhiv skozi bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "filtriraj arhiv skozi gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "filtriraj arhiv skozi compress" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "filtriraj arhiv skozi gzip" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "filtriraj arhiv skozi gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "filtriraj skozi PROGRAM (sprejemati mora izbiro -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Izbira lokalne datoteke:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "IMENIK" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "pomik v navedeni IMENIK" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "preberi seznam datotek z navedene DATOTEKE" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T prebere z \\000 terminirana imena; onemogoči -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "odstrani narekovaje iz imen datotek, prebranih s -T (privzeto)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "ne odstrani narekovajev iz imen datotek, prebranih s -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "VZOREC" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "brez datotek, ki jih opisuje VZOREC" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "brez datotek, ustrezajočim vzorcem, prebranih z DATOTEKE" -#: src/tar.c:631 +#: src/tar.c:640 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:644 +#: src/tar.c:653 #, fuzzy msgid "exclude directories containing FILE" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "podimenikov ne vključujemo avtomatično" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "pri arhiviranju izpusti datoteke na nelokalnih datotečnih sistemih" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "rekurzivno vključi vse podimenike" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "ne odstrani vodilnih »/« iz imen datotek" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "sledi simbolnim povezavam; arhiviraj/iznesi ciljne datoteke" -#: src/tar.c:658 +#: src/tar.c:667 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "sledi simbolnim povezavam; arhiviraj/iznesi ciljne datoteke" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "IME" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "začenÅ¡i z navedenim IMENOM v arhivu" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "shrani le datoteke, novejÅ¡e od DATUM-ČAS" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATUM" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "primerjaj datum in uro le, kadar se podatki spremenijo" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "TIP" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" "varnostna kopija pred brisanjem, z možnostjo izbire TIPA varnostne kopije" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "NIZ" -#: src/tar.c:669 +#: src/tar.c:678 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -1895,97 +1926,97 @@ msgstr "" "varnostna kopija pred brisanjem; prekličemo običajno PRIPONO (»~«, razen če " "lupinska spremenljivka SIMPLE_BACKUP_SUFFIX določa drugače)" -#: src/tar.c:674 +#: src/tar.c:683 #, fuzzy msgid "File name transformations:" msgstr "Druge izbire:" -#: src/tar.c:676 +#: src/tar.c:685 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "izpusti Å TEVILO vodilnih komponent iz imen datotek" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "IZRAZ" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 #, fuzzy msgid "ignore case" msgstr "izključitveni vzorci ne razlikujejo med malimi in velikimi črkami" -#: src/tar.c:689 +#: src/tar.c:699 #, fuzzy msgid "patterns match file name start" msgstr "izključitveni vzorci opisujejo celotno ime datoteke" -#: src/tar.c:691 +#: src/tar.c:701 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "" "izključitveni vzorci opisujejo ime datoteke od znaka »/« dalje (privzeto)" -#: src/tar.c:693 +#: src/tar.c:703 #, fuzzy msgid "case sensitive matching (default)" msgstr "" "izključitveni vzorci razlikujejo med malimi in velikimi črkami (privzeto)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "uporabi nadomestne znake (privzeto za izločanje)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "dobesedno ujemanje nizov" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "izključitveni vzorci ne opisujejo »/«" -#: src/tar.c:701 +#: src/tar.c:711 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "izključitveni vzorci opisujejo tudi »/« (privzeto)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Informativni izpisi:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "z izčrpnim izpisom obdelanih datotek" -#: src/tar.c:711 +#: src/tar.c:721 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:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "izpiÅ¡i sporočilo, če niso zapisane vse povezave" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1993,27 +2024,27 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "z izpisom časov sprememb datotek v UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "zapiÅ¡i izčrpno poročilo v DATOTEKO" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "z izpisom zaporednega bloka v arhivu ob vsakem sporočilu" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "vpraÅ¡aj za potrditev pri vsakem koraku" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "prikaži privzete nastavitve" -#: src/tar.c:735 +#: src/tar.c:745 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " @@ -2022,31 +2053,31 @@ msgstr "" "Pri izpisu seznama ali izvlačenju izpiÅ¡i vsak imenik, ki ne ustreza iskalnim " "pogojem" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "SLOG" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "nastavi slog navajanja imen; glej spodaj za veljavne SLOGE" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Združljivostne izbire:" -#: src/tar.c:753 +#: src/tar.c:763 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" @@ -2055,57 +2086,57 @@ msgstr "" "pri ustvarjanju arhiva isto kot --old-archive; pri izvlačenju isto kot --no-" "same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Druge izbire:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Naenkrat je dovoljena največ ena od izbir »-Acdtrux«" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Nasprotujoče si izbire glede stiskanja arhiva" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " neznan tip datoteke %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "Datoteke z datumom ni najti" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Nadomeščamo %s za neznan format datuma %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: datoteka je arhiv; brez iznosa" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2113,109 +2144,115 @@ msgstr "" "\n" "Privzete vrednosti *tega* programa tar:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Neveljaven faktor blokiranja" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Opozorilo: izbira -I ni podprta; ste želeli -j ali -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Neveljavna dolžina traku" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Več kot en pražni podatek" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Neveljavna skupina" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Podana zaščita ni veljavna" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Neveljavno Å¡tevilo" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Neveljaven lastnik" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Neveljavna dolžina zapisa" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Dolžina zapisa mora biti večkratnik %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Neveljavno Å¡tevilo elementov" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "Okvarjen argument gostote: »%s«" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Neznana gostota: »%c«" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[DATOTEKA]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Stara izbira »%c« zahteva argument." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence nima pomena brez seznama datotek" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence ni mogoče uporabiti v zahtevanem načinu delovanja" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Več arhivskih datotek zahteva izbiro »-M«" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Izbire --listed-incremental ni mogoče kombinirati z --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2224,43 +2261,51 @@ 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Arhivov v več delih ni mogoče preveriti" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Stisnjenega arhiva ni mogoče preveriti" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Stisnjeni arhivi v več delih niso mogoči" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Stisnjenega arhiva ni mogoče ažurirati" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "izbira --pax-option je mogoča le na arhivih POSIX" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Zahteva po odprtju praznega arhiva bojazljivo zavrnjena" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Izbire »-Aru« so nezdružljive z »-f -«" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Ena od izbir »-Acdtrux« je obvezna" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Izhod ob napaki zakasnjen zaradi prejÅ¡njih napak" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2271,83 +2316,83 @@ 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:158 +#: src/xheader.c:156 #, fuzzy, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Ključna beseda %s je bodisi neznana, bodisi Å¡e ni izvedena" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Vzorca %s ni mogoče uporabiti" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ključne besede %s ni mogoče preklicati" -#: src/xheader.c:498 +#: src/xheader.c:496 #, fuzzy msgid "Malformed extended header: missing length" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" -#: src/xheader.c:506 +#: src/xheader.c:504 #, fuzzy msgid "Extended header length is out of allowed range" msgstr "Podpis %s oblike base-64 v arhivu je izven obsega %s" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "Podpis %s oblike base-64 v arhivu je izven obsega %s" -#: src/xheader.c:525 +#: src/xheader.c:523 #, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "PoÅ¡kodovana razÅ¡irjena glava: za dolžino manjka presledek" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" -#: src/xheader.c:539 +#: src/xheader.c:537 #, fuzzy msgid "Malformed extended header: missing newline" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Vrednost arhiva %s je izven obsega %s: %s.%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, fuzzy, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, fuzzy, c-format msgid "Malformed extended header: excess %s=%s" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enačaj" @@ -2518,105 +2563,122 @@ msgstr "Å tevilka inoda izven obsega" msgid "Negative size: %s" msgstr "Neveljavna oznaka časa" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "Neznana sistemska napaka" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, fuzzy, c-format msgid "cannot open `%s'" msgstr "Ni mogoče odpreti %s" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "Ni mogoče zapreti" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr " neznan tip datoteke %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "Ni mogoče do statistike za datoteko %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "Naslednik umrl s signalom %d" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" # POZOR Je to res to? -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--Predelana imena datotek--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "prekliči učinek izbire --delay-directory-restore" + #~ msgid "[.]NUMBER" #~ msgstr "[.]N" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Izhod ob napaki zakasnjen zaradi prejÅ¡njih napak" + #~ msgid "block size" #~ msgstr "velikost bloka" @@ -3402,9 +3464,6 @@ msgstr "" #~ msgid "Cannot open file %s" #~ msgstr "Ni mogoče odpreti datoteke %s" -#~ msgid "Archive %s EOF not on block boundary" -#~ msgstr "Arhiv %s se ne konča s koncem bloka" - #~ msgid "Only read %d bytes from archive %s" #~ msgstr "Prebrano samo %d zlogov z arhiva %s" diff --git a/po/sv.gmo b/po/sv.gmo index 63a3f0c8fd780427fd7973be640e5edcc19e47aa..63569c40e1b43f236f601572c1e8c866b7224211 100644 GIT binary patch delta 9601 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 QWmT^K*E4G-@46ZMf8L&{MgRZ+ delta 9532 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 ci*pO}3MZ7OZ<, 2000, 2001, 2004, 2006, 2007 -# Revision: 1.85 +# Copyright © 1996, 2001, 2004, 2005, 2006, 2007, 2008 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 +# Revision: 1.88 # msgid "" msgstr "" -"Project-Id-Version: tar 1.19.90\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2008-02-14 17:49+0100\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-04-16 17:04+0200\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -81,7 +82,7 @@ msgstr " [FLAGGA...]" 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" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -93,15 +94,15 @@ msgstr "" msgid "Unknown system error" msgstr "Okänt systemfel" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "visa denna hjälptext" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "ge ett kort hjälpmeddelande" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "NAMN" @@ -114,11 +115,11 @@ msgstr "ange programnamnet" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "vänta i SEK sekunder (standardvärde 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "visa programversion" @@ -136,7 +137,7 @@ msgstr "%s: För mÃ¥nga argument\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(PROGRAMFEL) Flagga borde ha känts igen!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "skrivfel" @@ -195,16 +196,16 @@ msgstr "%s: flaggan \"-W %s\" är tvetydig\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flagga \"-W %s\" tar inget argument\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "minnet slut" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "kan inte lagra nuvarande arbetskatalog" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "kan inte gÃ¥ tillbaka till initial arbetskatalog" @@ -323,11 +324,23 @@ msgstr "\"" msgid "'" msgstr "\"" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[yYjJ]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nN]" @@ -552,102 +565,102 @@ msgstr "För tidigt filslut" msgid "Garbage command" msgstr "Okänt kommando" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Det här ser inte ut som ett tar-arkiv" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Summa skrivna byte" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Summa lästa byte" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Summa borttagna byte: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(rör)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Ogiltigt värde pÃ¥ record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Arkivnamn saknas" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Kan inte verifiera standard in/ut-arkiv" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arkivet är komprimerat. Använd flaggan %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Komprimerade arkiv kan inte uppdateras" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Vid bandets början, avslutar nu" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "För mÃ¥nga fel, avslutar" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek stannade inte pÃ¥ en postgräns" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: innehÃ¥ller ogiltigt volymnummer" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Volymnummer flödade över" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Filslut vid förväntat användarsvar" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "VARNING: Arkivet är ofullständigt" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -658,65 +671,66 @@ msgstr "" " q Avsluta programmet\n" " y eller nyrad Fortsätt\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Starta ett underskal\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Skriv denna lista\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Ingen ny volym; avslutar.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Filnamn inte angivet, försök igen.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ogiltig indata. Skriv ? för hjälp.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "kommandot \"%s\" misslyckades" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsätter inte i denna volym" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har fel storlek (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Denna volym kommer inte i rätt ordning" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, 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:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Volym %s överensstämmer inte med %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -724,6 +738,11 @@ msgstr "" "%s: filnamnet är för lÃ¥ngt för att lagras i huvudet för ett GNU " "multivolymsarkiv, trunkerat" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek stannade inte pÃ¥ en postgräns" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -735,8 +754,8 @@ msgstr[1] "Kunde bara läsa %lu av %lu byte" msgid "Contents differ" msgstr "InnehÃ¥llet är olika" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Oväntat filslut i arkivet" @@ -853,7 +872,7 @@ msgstr[1] "%s: Fil krympte med %s byte, fyller ut med nolltecken" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: filen finns pÃ¥ ett annat filsystem; inte arkiverad" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "innehÃ¥llet inte arkiverat" @@ -882,7 +901,7 @@ msgstr "%s: filen är själva arkivet; inte arkiverad" msgid "%s: File removed before we read it" msgstr "%s: Fil borttagen innan vi läste den" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "katalog inte arkiverad" @@ -933,166 +952,166 @@ msgstr "%s: Katalog bytte namn innan dess status kunde extraheras" msgid "Extracting contiguous files as regular files" msgstr "Extraherar sammanhängande filer som vanliga filer" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Försöker extrahera symboliska länkar som hÃ¥rda länkar" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Läser %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Oväntat huvud för lÃ¥ngt filnamn" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Okänd filtyp \"%c\", extraherad som en normal fil" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Nuvarade \"%s\" är nyare eller lika gammal" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s kunde inte säkerhetskopieras" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Kan inte byta namn pÃ¥ %s till %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Felet kan inte Ã¥tgärdas, avslutar nu" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Katalogen har bytt namn frÃ¥n %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Katalogen har bytt namn" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Katalogen är ny" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Ogiltigt värde pÃ¥ tidsvärde" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Ogiltig modifikationstid (sekunder)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Ogiltig modifikationstid (nanosekunder)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Ogiltigt enhetsnummer" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Ogiltigt inodnummer" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Fält för lÃ¥ngt när ögonblicksfil lästes" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Läsfel i ögonblicksfil" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Oväntat filslut i ögonblicksfil" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Oväntat fältvärde i ögonblicksfil" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Postavslutare fattas" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Felaktigt filformat för inkrementell säkerhetskopiering" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Formatversion för inkrementell säkerhetskopiering stöds inte: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Felaktig dumpkatalog: förväntade \"%c\" men hittade %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Felaktig dumpkatalog: \"X\" duplicerad" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Felaktig dumpkatalog: tomt namn i \"R\"" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Felaktig dumpkatalog: \"T\" föregÃ¥s inte av \"R\"" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Felaktig dumpkatalog: tomt namn i \"T\"" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Felaktig dumpkatalog: \"X\" används inte" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan inte skapa temporärkatalog med mall %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Rensar inte katalog: kunde inte ta status" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Tar bort %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan inte ta bort" @@ -1112,19 +1131,19 @@ msgstr "block %s: ** Block av nolltecken **\n" msgid "block %s: ** End of File **\n" msgstr "block %s: ** Filslut **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "block %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1132,68 +1151,68 @@ msgstr "" "komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkivet innehÃ¥ller förÃ¥ldrade \"base-64\"-huvuden" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " länk till %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " okänd filtyp \"%s\"\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--LÃ¥ng länk--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--LÃ¥ngt namn--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Volymhuvud--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsätter vid byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Skapar katalog:" @@ -1230,25 +1249,25 @@ msgstr "interprocesskanal" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Mönstermatchningstecken används i filnamn." -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" "Använd --wildcards för att slÃ¥ pÃ¥ mönstermatchning, eller --no-wildcards för" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "att undertrycka denna varning." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Fanns inte i arkivet" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Nödvändig förekomst hittades inte i arkivet" @@ -1275,7 +1294,7 @@ msgstr "" "Okänd citeringsstil \"%s\". Gör \"%s --quoting-style=help för att fÃ¥ en " "lista." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1293,7 +1312,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:343 +#: src/tar.c:345 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 " @@ -1315,87 +1334,87 @@ msgstr "" "annars\n" " never, simple gör alltid enkla säkerhetskopior\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Operationsläge:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "visa innehÃ¥llet i arkivet" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "extrahera filer frÃ¥n arkivet" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "skapa ett nytt arkiv" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "visa skillnader mellan filsystemet och arkivet" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "lägg till filer pÃ¥ slutet av arkivet" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "lägg till filer som är nyare än de i arkivet" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "lägg till innehÃ¥llet i en arkivfil till arkivet" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "ta bort frÃ¥n arkivet (inte för arkiv pÃ¥ magnetband!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "verifiera arkivets volymnamn och avsluta." -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Modifiera operationslägen:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "hantera filer med hÃ¥l mer effektivt" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "ÖVRE[.UNDRE]" -#: src/tar.c:401 +#: src/tar.c:403 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:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "hantera gamla GNU-formatet för inkrementell säkerhetskopiering" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FIL" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "hantera nya GNU-formatet för inkrementell säkerhetskopiering" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "avsluta inte med felslutstatus p.g.a. oläsbara filer" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMMER" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1407,117 +1426,118 @@ 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:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "arkivet är sökbart" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "kontrollera inte enhetsnummer när inkrementella arkiv skapas" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" +"kontrollera enhetsnummer när inkrementella arkiv skapas (standardvärde)" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Kontrollera överskrivning:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "försök verifiera arkivet efter det skapats" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "ta bort filer efter de sparats i arkivet" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "ersätt inte befintliga filer vid extrahering" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "skriv över befintliga filer vid extrahering" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "ta bort befintliga filer innan de nya extraheras" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "töm kataloghierarkier före extrahering av katalog" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "bevara befintliga katalogers metadata" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "skriv över metadata för befintliga kataloger vid extrahering (standardvärde)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Välj utdataström:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "extrahera filer till standard ut" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMMANDO" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "extrahera filer till standard in för ett annat program" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "ignorera barnprocessers slutstatus" -#: src/tar.c:460 +#: src/tar.c:462 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:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Hantering av filattribut:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "sätt NAMN som ägare för adderade filer" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "sätt NAMN som grupp för adderade filer" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DATUM-ELLER-FIL" -#: src/tar.c:472 +#: src/tar.c:474 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:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "RÄTTIGHET" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "sätt (symbolisk) RÄTTIGHET för adderade filer" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "METOD" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1527,28 +1547,28 @@ msgstr "" "tiderna efter läsning (METOD=\"replace\", standardvärde) eller genom att " "inte sätta tiderna alls (METOD=\"system\")" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "extrahera inte filers modifieringstid" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "försök extrahera filer med samma ägare som i arkivet" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "extrahera filer med dig själv som ägare" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "använd alltid tal för användar- och gruppnamn" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "extrahera information om filrättigheter (standardvärde för superanvändare)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1556,15 +1576,15 @@ msgstr "" "applicera användarens umask när rättigheter extraheras frÃ¥n arkivet " "(standardvärde för vanliga användare)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "sortera namn som ska extraheras sÃ¥ de passar ihop med arkivet" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "samma som bÃ¥de -p och -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1572,139 +1592,139 @@ msgstr "" "fördröj sättandet av modifikationstider och rättigheter pÃ¥ extraherade " "kataloger till slutet pÃ¥ arkivextraheringen." -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "ta bort effekten av flaggan --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Enhetsval och enhetsbyte:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARKIV" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "använd arkivfil eller enhet ARKIV" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "arkivfilen är lokal även om namnet har kolon" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "använd KOMMANDO istället för rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "använd KOMMANDO istället för rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "ange enhet och densitet" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "skapa/visa/extrahera ett flervolymsarkiv" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "byt band efter det att NUMMER x 1024 byte skrivits" -#: src/tar.c:539 +#: src/tar.c:541 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:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "använd/uppdatera volymnummer i FIL" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Blockhantering:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOCK" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCK x 512 byte per post" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMMER byte per post, multipel av 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorera block med enbart nolltecken (betyder filslut)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "omblocka vid läsning (för 4.2BSD-rör)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Val av arkivformat:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "skapa ett arkiv med givet format" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "FORMAT är ett av följande:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "gammalt V7 format" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "GNU-format enligt tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU-format frÃ¥n tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) format" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) format" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "samma som pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "samma som --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "samma som --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "nyckelord[[:]=värde][,nyckelord[[:]=värde], ...]" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "ange nyckelord för pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "NAMN" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1712,84 +1732,98 @@ msgstr "" "skapa ett arkiv med volymnamnet NAMN. Vid visning/extrahering är NAMN ett " "skalmönster (\"globbing\")" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Komprimeringsflaggor:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "använd arkivsuffix för att bestämma komprimeringsprogram" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "använd arkivsuffix för att bestämma komprimeringsprogram" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "filtrera arkivet genom bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "filtrera arkivet genom gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "filtrera arkivet genom compress" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "filtrera arkivet genom lzma" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "filtrera arkivet genom gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "filtrera genom PROG (mÃ¥ste förstÃ¥ -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Filval:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "KATALOG" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "byt katalog till KATALOG" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "hämta namn att extrahera frÃ¥n FIL" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T läser namn Ã¥tskilda med nolltecken, -C obrukbar" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "avcitera filnamn som lästs med -T (standardvärde)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "avcitera inte filnamn som lästs med -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "MÖNSTER" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "utelämna filer som matchar MÖNSTER" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "utelämna filer som matchar mönster i FIL" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1797,87 +1831,87 @@ msgstr "" "utelämna innehÃ¥llet i kataloger som innehÃ¥ller CACHEDIR.TAG, förutom " "CACHEDIR.TAG själv" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "utelämna allt i kataloger som innehÃ¥ller CACHEDIR.TAG" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "utelämna kataloger som innehÃ¥ller CACHEDIR.TAG" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "utelämna allting i kataloger som innehÃ¥ller FIL" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "utelämna kataloger som innehÃ¥ller FIL" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "uteslut kataloger frÃ¥n versionshanteringssystem" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "gÃ¥ inte automatiskt ned i kataloger" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "byt inte filsystem när arkivet skapas" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "gÃ¥ rekursivt ned i kataloger (standardvärde)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "tag inte bort inledande \"/\" frÃ¥n namn" -#: src/tar.c:656 +#: src/tar.c:665 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:658 +#: src/tar.c:667 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:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "NAMN" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "börja med fil NAMN i arkivet" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "arkivera bara filer nyare än DATUM-ELLER-FIL" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "DATUM" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "jämför datum och tid endast för dataändringar" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "KONTROLL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "gör säkerhetskopior före borttagning, välj typ av versionshantering" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "STRÄNG" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1886,91 +1920,91 @@ msgstr "" "säkerhetskopieändelsen (\"~\" om inte ändrad med miljövariabeln " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Filnamnstransformationer:" -#: src/tar.c:676 +#: src/tar.c:685 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:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "UTTRYCK" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "använd seds ersättnings-UTTRYCK för att transformera filnamn" -#: src/tar.c:684 +#: src/tar.c:694 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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "matcha gemener och versaler lika" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "mönster mÃ¥ste matcha i början pÃ¥ filnamn" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "mönster matchas efter \"/\" i filnamn (standardvärde vid uteslutning)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "matcha gemener och versaler olika (standardvärde)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "använd jokertecken (standardvärde för uteslutning)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "ordagrann strängjämförelse" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "jokertecken matchar inte \"/\"" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "jokertecken matchar \"/\" (standardvärde för uteslutning)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Informativ utskrift:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "visa namn pÃ¥ alla filer som behandlas" -#: src/tar.c:711 +#: src/tar.c:721 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:713 +#: src/tar.c:723 msgid "ACTION" msgstr "ÅTGÄRD" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "utför ÅTGÄRD vid vare kontrollpunkt" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "visa ett meddelande om inte alla länkar arkiverats" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1981,27 +2015,27 @@ 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:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "visa filers modifieringstid i UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "skicka informativa meddelanden till FIL" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "visa blocknummer inom arkivet för varje meddelande" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "frÃ¥ga efter bekräftelse för varje steg" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "visa standardvärden för \"tar\"" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2009,31 +2043,31 @@ msgstr "" "vid visning eller extrahering, visa varje katalog som inte matchar " "sökkriterium" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "visa fil- eller arkivnamn efter transformering" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "STIL" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "citera även tecken i STRÄNG" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "citera inte tecken i STRÄNG" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Kompatibilitetsflaggor:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2041,56 +2075,56 @@ msgstr "" "vid skapande, samma som --old-archive. Vid extrahering, samma som --no-same-" "owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Andra flaggor:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "begränsa användningen av eventuellt farliga flaggor" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Du kan endast ange en av flaggorna \"-Acdtrux\"" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Motstridiga komprimeringsflaggor" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Okänt signalnamn: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Tidsfil hittades inte" -#: src/tar.c:997 +#: src/tar.c:1017 #, 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:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Flagga %s: Tolkar tidsangivelse \"%s\" som %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: fillistan redan läst" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: filnamnet som lästes innehÃ¥ller nolltecken" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Giltiga argument till flaggan --quoting-style är:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2098,151 +2132,165 @@ msgstr "" "\n" "*Denna* tar har standardvärdena:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Ogiltig blockfaktor" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Varning: flaggan -I stöds inte, du kanske menade -j eller -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Ogiltig bandlängd" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Mer än en datumgräns" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Ogiltig version för filer med hÃ¥l" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' stöds inte pÃ¥ denna plattform" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "--checkpoint-värdet är inte ett heltal" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Ogiltig grupp" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Ogiltiga rättigheter givna för flagga" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Ogiltigt nummer" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Ogiltig ägare" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Ogiltig poststorlek" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Poststorlek mÃ¥ste vara en multipel av %d" -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Ogiltig antal element" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Endast en --to-command flagga tillÃ¥ten" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Ogiltig densitetsangivelse: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Okänd densitet: \"%c\"" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FIL]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Gammal flagga \"%c\" kräver ett argument" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence är meningslöst utan en fillista" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence kan inte användas i det begärda operationsläget." -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Multipla arkivfiler kräver \"-M\" flaggan" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Kan inte kombinera --listed-incremental med --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Flervolymsarkiv kan inte verifieras" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Komprimerade arkiv kan inte verifieras" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Kan inte använda komprimerade flervolymsarkiv" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Komprimerade arkiv kan inte slÃ¥s samman" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option kan bara användas pÃ¥ POSIX-arkiv" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Vägrar fegt att skapa ett tomt arkiv" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Flaggorna \"-Aru\" är inkompatibla med \"-f -\"" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Du mÃ¥ste ange en av flaggorna \"-Acdtrux\"" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Avslut med felslutstatus fördröjd frÃ¥n föregÃ¥ende fel" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2251,79 +2299,79 @@ 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:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Nyckelordet %s är okänt eller inte ännu implementerat" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Mönster %s kan inte användas" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Nyckelord %s kan inte ersättas" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Felaktigt utökat huvud: längd saknas" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Längd pÃ¥ utökat huvud är utanför giltigt intervall" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Felaktigt utökat huvud: blanktecken efter längdangivelse saknas" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Felaktigt utökat huvud: likamedtecken saknas" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Felaktigt utökat huvud: nyrad saknas" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Ignorerar nykelord \"%s\" i utökat huvud" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Felaktigt utökat huvud: ogiltig %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Felaktigt utökat huvud: för mÃ¥nga %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, 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:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Felaktigt utökat huvud: ogiltigt %s: udda antal värden" @@ -2495,96 +2543,113 @@ msgstr "Nummer utanför giltigt intervall: %s" msgid "Negative size: %s" msgstr "Negativ storlek: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "status (stat) kunde ej tas pÃ¥ %s" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Fel vid parsning av tal nära \"%s\"" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Okänt datumformat" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGUMENT...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "kan inte öppna \"%s\"" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "kan inte flytta (seek)" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "filnamnet innehÃ¥ller nolltecken" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "kan inte skapa filer med hÃ¥l till standard ut, använd flaggan --file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "felaktig mask (nära \"%s\")" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Okänt fält \"%s\"" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "kan inte sätta tid pÃ¥ \"%s\"" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Kommandot avslutades utan fel\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Kommandot misslyckades med slutstatus %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Kommandot terminerades av signal %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Kommandot stoppades av signal %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Kommandot dumpade minnet\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Kommandot avslutade\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat kräver filnamn" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "för mÃ¥nga argument" + +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "ta bort effekten av flaggan --delay-directory-restore" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Avslut med felslutstatus fördröjd frÃ¥n föregÃ¥ende fel" diff --git a/po/tar.pot b/po/tar.pot index 23c9429..3b9829f 100644 --- a/po/tar.pot +++ b/po/tar.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -80,7 +80,7 @@ msgstr "" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -89,15 +89,15 @@ msgstr "" msgid "Unknown system error" msgstr "" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "" @@ -132,7 +132,7 @@ msgstr "" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -191,16 +191,16 @@ msgstr "" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "" @@ -319,11 +319,23 @@ msgstr "" msgid "'" msgstr "" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -517,102 +529,102 @@ msgstr "" msgid "Garbage command" msgstr "" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "" -#: src/buffer.c:678 +#: src/buffer.c:695 #, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" +msgid "Record size = %lu block" +msgid_plural "Record size = %lu blocks" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:698 +#: src/buffer.c:716 #, c-format -msgid "Record size = %lu block" -msgid_plural "Record size = %lu blocks" +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:771 +#: src/buffer.c:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "" -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -620,69 +632,74 @@ msgid "" " y or newline Continue operation\n" msgstr "" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" +#: src/buffer.c:1619 +msgid "write did not end on a block boundary" +msgstr "" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -694,8 +711,8 @@ msgstr[1] "" msgid "Contents differ" msgstr "" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "" @@ -812,7 +829,7 @@ msgstr[1] "" msgid "%s: file is on a different filesystem; not dumped" msgstr "" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -841,7 +858,7 @@ msgstr "" msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "" @@ -892,165 +909,165 @@ msgstr "" msgid "Extracting contiguous files as regular files" msgstr "" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "" @@ -1070,86 +1087,86 @@ msgstr "" msgid "block %s: ** End of File **\n" msgstr "" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr "" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr "" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "" @@ -1186,24 +1203,24 @@ msgstr "" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "" @@ -1228,7 +1245,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1239,7 +1256,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1251,86 +1268,86 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1338,549 +1355,561 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "" -#: src/tar.c:606 +#: src/tar.c:612 +msgid "filter the archive through lzop" +msgstr "" + +#: src/tar.c:613 msgid "PROG" msgstr "" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1888,261 +1917,275 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "" -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "" -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" +msgid "Exiting with failure status due to previous errors" msgstr "" #: src/update.c:86 @@ -2152,79 +2195,79 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "" msgstr[1] "" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" @@ -2384,96 +2427,106 @@ msgstr "" msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" diff --git a/po/tr.gmo b/po/tr.gmo index 56575174013ac2013c07077e24111f55d2429647..324336c9c7ddfba8993a9ca4ca74ff83eb14169e 100644 GIT binary patch delta 10489 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\n" "Language-Team: Turkish \n" @@ -81,7 +81,7 @@ msgstr " [SEÇENEK...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' veya `%s --usage' yazın.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -92,15 +92,15 @@ msgstr "" msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "bu yardım iletisi gösterilir" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "kısa bir kullanım iletisi gösterilir" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "Ä°SÄ°M" @@ -113,11 +113,11 @@ msgstr "uygulama ismi" msgid "SECS" msgstr "SAN" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "SANÄ°YE saniye bekler (öntanımlı 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "sürüm bilgisi gösterilir" @@ -135,7 +135,7 @@ msgstr "%s: argüman sayısı fazla\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(YAZILIM HATASI) Seçenek tanınmak zorunda!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -194,16 +194,16 @@ msgstr "%s: `-W %s' seçeneği belirsiz\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneği argümansız kullanılır\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "bellek tükendi" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "Çalışma dizini değiştirilemez" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "Çalışılan dizin kaydedilemez" @@ -324,11 +324,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[eEyY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[hHnN]" @@ -530,102 +542,102 @@ msgstr "Dosya sonu belirsiz" msgid "Garbage command" msgstr "Bozuk komut" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Bu bir tar arşivi gibi görünmüyor" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Yazılan toplam bayt" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Okunan toplam bayt" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Silinen toplam bayt: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(boru)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "record_size için geçersiz değer" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Arşiv ismi verilmemiş" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "stdG/stdÇ arşivi doğrulanamaz" -#: src/buffer.c:517 +#: src/buffer.c:536 #, 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:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Sıkıştırılmış arşivler güncellenemez" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Bandın başlangıcında, şimdilik çıkıyor" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Çok hata var, çıkıyor" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, 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:771 +#: src/buffer.c:716 +#, 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:793 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:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek bir kaydın sınırında durmadı" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: geçersiz bölüm numarası içeriyor" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Bölüm numarası kapsamdışı" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Kullanıcı cevabı beklenirken dosya sonuna gelindi" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "UYARI: Arşiv eksik" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -636,70 +648,76 @@ msgstr "" " q Uygulama sonlandırılır\n" " y veya İşlem sürdürülür\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! bir alt kabuk açılır\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Bu listeyi basar\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Yeni bölüm yok; çıkıyor.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Dosya ismi belirtilmemiş. Tekrar deneyin.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Girdi geçersiz, Yardım için ? yazın.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "%s komutu başarısız" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s bu bölümde devam etmiyor" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s yanlış uzunluk (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Bu bölüm sıralama dışı" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Arşiv etiketi %s ile eşleşmiyor" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "%s bölümü %s ile eşleşmiyor" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, 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:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek bir kaydın sınırında durmadı" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -711,8 +729,8 @@ msgstr[1] "Sadece %2$lu baytın %1$lu baytı okunabildi" msgid "Contents differ" msgstr "İçerikler farklı" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Arşivde beklenmeyen dosya sonu" @@ -830,7 +848,7 @@ msgstr[1] "%s: Dosya %s baytta kaldı; sıfırlarla dolduruluyor" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: dosya farklı bir dosya sisteminde; dökümlenmedi" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "içerik dökümlenmedi" @@ -859,7 +877,7 @@ msgstr "%s: dosya arşivdir; dökümlenmedi" msgid "%s: File removed before we read it" msgstr "%s: Dosya okunamadan kaldırıldı" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "dizin dökümlenmedi" @@ -910,165 +928,165 @@ msgstr "%s: durumu çıkarılamadan dizin ismi değiştirildi" msgid "Extracting contiguous files as regular files" msgstr "Bitişik dosyaları normal dosyalar olarak çıkarıyor" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Sembolik bağlar, sabit bağlar olarak çıkarılmaya çalışılıyor" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "%s okunuyor\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format 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:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Umulmadık uzun isim başlığı" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Bilinmeyen dosya türü '%c', normal dosya olarak çıkartılıyor" -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Mevcut %s daha yeni ya da yaşıt" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Bu dosyayı yedeklemek mümkün olmadı" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "%s ismi %s olarak değiştirilemez" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Hata kurtarılabilir değil: şimdilik çıkılıyor" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Dizinin eski adı %s idi" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Dizin adı değiştirilmişti" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Dizin yeni" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Geçersiz zaman damgası" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Değişiklik zamanı (saniye cinsinden) geçersiz" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Değişiklik zamanı (nanosaniye cinsinden) geçersiz" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Geçersiz aygıt numarası" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Geçersiz düğüm numarası" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Anlık görüntü dosyası okunurken alan çok uzun" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Anlık görüntü dosyasında okuma hatası" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Anlık görüntü dosyasında beklenmeyen dosya sonu" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Anlık görüntü dosyasında beklenmeyen alan değeri" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Kayıt sonlandırıcı eksik" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Arttırımlı dosya biçimi hatalı" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Desteklenmeyen arttırımlı biçim sürümü: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir bozuk: umulan '%c' ama bulunan %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir bozuk: 'X' yinelenmiş" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir bozuk: 'R'deki isim boş" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir bozuk: 'T' 'R' ile öncelenmemiş" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir bozuk: 'T'deki isim boş" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir bozuk: umulan'%c' ama bulunan veri sonu" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir bozuk: 'X' hiç kullanılmamış" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s şablonu kullanılarak geçici dizin oluşturulamıyor" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: dizin temizlenmiyor: durumlama yapılamadı" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: dizin farklı bir aygıtta: temizlenmiyor" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s siliniyor\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kaldırılamaz" @@ -1088,19 +1106,19 @@ msgstr "blok %s: ** NUL bloku **\n" msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Dosya Sonu **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1108,68 +1126,68 @@ msgstr "" "ediliyor" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, 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:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Arşiv atıl base-64 başlıklar içeriyor" -#: src/list.c:763 +#: src/list.c:772 #, 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:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, 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:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " bağı -> %s \n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " bilinmeyen dosya türü %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Uzun Bağ--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Uzun Ä°sim--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Bölüm Başlığı--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Devamı bayt %s de--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Oluşturulan dizin:" @@ -1206,24 +1224,24 @@ msgstr "süreçlerarası kanal" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Kalıp eşleme karakterleri dosya isimlerinde kullanılmış. Lütfen," -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "ya kalıp eşlemeyi etkin kılmak için --wildcards kullanın," -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "ya da bu uyarıyı engellemek için --no-wildcards kullanın." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Arşivde yok" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Arşivde bulunması gerekirken yok" @@ -1250,7 +1268,7 @@ msgstr "" "Sarmalama şekli `%s' bilinmiyor. Listeyi almak için `%s --quoting-" "style=help' yazın." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1269,7 +1287,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:343 +#: src/tar.c:345 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 " @@ -1290,86 +1308,86 @@ 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:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Ana işlem kipi:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "bir arşiv içeriğini listeler" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "bir arşivdeki dosyaları çıkarır" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "yeni bir arşiv oluşturur" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "arşiv ile dosya sistemi arasındaki farklar bulunur" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "dosyaları arşivin sonuna ekler" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "sadece arşivdeki kopyasından daha yeni dosyalar eklenir" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "bir arşive tar dosyaları ekler" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "arşivden siler (teyplerde değil!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "arşiv bölüm etiketini sınar ve çıkar" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "İşlem değiştiriciler:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "seyrek dosyalar verimli şekilde elde edilir" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "ANA[.ALT]" -#: src/tar.c:401 +#: src/tar.c:403 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:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "GNU eski tarz arttırımlı yedekleme tanınır" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "DOSYA" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "GNU yeni tarz arttırımlı yedekleme tanınır" -#: src/tar.c:407 +#: src/tar.c:409 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:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "SAYI" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1381,117 +1399,117 @@ 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:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "arşiv arama yapılabilen türde" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Üsteyazma denetimi:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "yazdıktan sonra arşivi doğrulamaya çalışır" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "arşive eklendikten sonra dosyalar silinir" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "çıkarılırken mevcut dosyalar değiştirilmez" -#: src/tar.c:435 +#: src/tar.c:437 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:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "çıkarılırken mevcut dosyaların üzerine yazılır" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "çıkarılmadan önce mevcut dosya silinir" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "dizin çıkarılmadan önce alt dizinleri silinir" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "mevcut dizinlerin öznitelikleri korunur" -#: src/tar.c:445 +#: src/tar.c:447 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:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Çıktı akımını seçiniz:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "dosyalar standart çıktıya çıkarılır" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMUT" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "çıkarılan dosyaları başka bir uygulamaya borular" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "altsüreçlerin çıkış kodları yoksayılır" -#: src/tar.c:460 +#: src/tar.c:462 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:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Dosya özniteliklerinin elde edilmesi:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "Ä°SÄ°M eklenen dosyaların sahibi yapılır" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "Ä°SÄ°M eklenen dosyaların grubu yapılır" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "DOSYA-TARÄ°HÄ°" -#: src/tar.c:472 +#: src/tar.c:474 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:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "KÄ°P" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "KÄ°P eklenen dosyaların (sembolik) kipi yapılır" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "YÖNTEM" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1501,28 +1519,28 @@ 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "dosya değişiklik zamanı çıkarılmaz" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "sahibi aynı olan dosyalar çıkarılmaya çalışılır" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "dosyalar sizin sahipliğinizde çıkarılır" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "kullanıcı/grup isimleri yerine daima numaraları kullanılır" -#: src/tar.c:489 +#: src/tar.c:491 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:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1530,15 +1548,15 @@ 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:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "isimler arşivdeki sırasına göre çıkarılır" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "-p ve -s birlikte verilmiş gibi olur" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1546,139 +1564,139 @@ msgstr "" "herşey çıkarılana kadar çıkarılan dizinlerin izinleri ve değişiklik " "zamanlarının değiştirilmesi geciktirilir" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore seçeneğinin etkisi iptal edilir." -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Aygıt seçimi ve aygıt değiştirme:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "ARŞİV" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "arşiv dosyası ya da ARŞİV aygıtı kullanılır" -#: src/tar.c:513 +#: src/tar.c:515 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:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "rmt yerine rmt KOMUT kullanılır" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "rsh yerine uzak uçta KOMUT kullanılır" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "sürücü ve yoğunluk belirtilir" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "çok bölümlü arşivi oluşturur/listeler/çıkarır" -#: src/tar.c:537 +#: src/tar.c:539 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:539 +#: src/tar.c:541 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:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "DOSYAda bölüm numarası kullanılır/güncellenir" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Aygıtın blok düzeni:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "BLOK" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "kayıt başına BLOK x 512 bayt" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "512'nin katları olarak kayıt başına BOYUT bayt" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "arşivdeki sıfırlı bloklar yoksayılır (dosyasonu anlamında)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "okunmuş olarak yeniden bloklanır (4.2 BSD boruları için)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Arşiv biçimi seçimi:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "BİÇİM" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "belirtilen biçimin arşivi oluşturulur." -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "BİÇİM şunlardan biri olabilir:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "eski V7 tar biçimi" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 için GNU biçimi" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x biçimi" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) biçimi" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) biçimi" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "pax ile aynı" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr " --format=v7 ile aynı" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "--format=posix ile aynı" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "isim[[:]=değer][,isim[[:]=değer]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "pax anahtar sözcüklerini denetler" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "METÄ°N" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1686,176 +1704,189 @@ 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:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "Sıkıştırma seçenekleri çelişiyor" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "arşivi bzip2 üzerinden geçirir" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "arşivi gzip üzerinden geçirir" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "arşivi compress üzerinden geçirir" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "arşivi gzip üzerinden geçirir" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "arşivi gzip üzerinden geçirir" + +#: src/tar.c:613 msgid "PROG" msgstr "UYG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "arşivi UYG üzerinden geçirir (UYG -d kabul etmeli)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Yerel dosya seçimi:" -#: src/tar.c:615 +#: src/tar.c:622 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:616 +#: src/tar.c:623 msgid "DIR" msgstr "DÄ°ZÄ°N" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "DÄ°ZÄ°N dizinine geçilir" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "çıkarılacak ya da oluşturulacak isimler DOSYAdan alınır" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T boş karakter sonlandırmalı isimleri okur, -C iptal edilir" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "-T ile okunan dosyaisimlerine tırnak ayıklama uygulanır" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "-T ile okunan dosyaisimlerine tırnak ayıklama uygulanmaz" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "ŞABLON" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "belirtilen ŞABLONa uyan dosyalar hariç tutulur" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "DOSYAdaki şablonlara uyan isimler hariç tutulur" -#: src/tar.c:631 +#: src/tar.c:640 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:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG içeren dizinlerin altındaki herşey hariç tutulur" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG içeren dizinler hariç tutulur" -#: src/tar.c:639 +#: src/tar.c:648 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:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "DOSYA içeren dizinlerin altındaki herşey hariç tutulur" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "DOSYA içeren dizinler hariç tutulur" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "dizinlerde özdevinimli olarak azalan sıralamadan kaçınılır" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "arşiv oluşturulurken yerel dosya sisteminde kalınır" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "dizinlerin alt dizinlerine inilir (öntanımlı)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "dosya isimlerinin başındaki `/'lar ayrılmaz" -#: src/tar.c:656 +#: src/tar.c:665 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:658 +#: src/tar.c:667 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "" "sembolik bağlar izlenir; hedeflerindeki dosyalar arşivlenir ve dökümlenir" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "ÜYE-Ä°SMÄ°" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "arşivin ÜYE-Ä°SMÄ° üyesinden başlanır" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "sadece DOSYA-TARÄ°HÄ°nden daha yeni dosyalar saklanır" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "TARÄ°H" -#: src/tar.c:665 +#: src/tar.c:674 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:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "DENETÄ°M" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "kaldırılmadan önce DENETÄ°M sürümü seçilerek yedeklenir" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "DÄ°ZGE" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1863,89 +1894,89 @@ 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:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Dosya ismi dönüşümleri:" -#: src/tar.c:676 +#: src/tar.c:685 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:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "Ä°FADE" -#: src/tar.c:679 +#: src/tar.c:688 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:684 +#: src/tar.c:694 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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "harf büyüklükleri önemsenmez" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "dosya isminin başlangıcına uyan kalıplar" -#: src/tar.c:691 +#: src/tar.c:701 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:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "harf büyüklüklerine duyarlı eşleşme (öntanımlı)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "genelleme kalıpları kullanılır (dışlama için öntanımlı)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "birebir dizge eşleme" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "'/' ile eşleşmeyen genelleme kalıpları" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "'/' ile eşleşen genelleme kalıpları (dışlama için öntanımlı)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Bilgilendirme çıktısı:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "işlenen dosyalar ayrıntılı listelenir" -#: src/tar.c:711 +#: src/tar.c:721 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:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 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:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "SiNYAL" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1956,113 +1987,113 @@ 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:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "dosya değişiklik zamanları UTC'ye göre basılır" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "ayrıntılı çıktı DOSYAya gönderilir" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "her iletide arşiv içindeki blok sayısı gösterilir" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "her eylemden önce doğrulama istenir" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "tar öntanımlıları gösterilir" -#: src/tar.c:735 +#: src/tar.c:745 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:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "dönüşümden sonra dosya ve arşiv isimlerini gösterir" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "ŞEKÄ°L" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "DÄ°ZGEdeki sarmalama karakterlerine ek olarak" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "DÄ°ZGEdeki karakterler için sarmalamayı iptal eder" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Uyumluluk seçenekleri:" -#: src/tar.c:753 +#: src/tar.c:763 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:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Diğer seçenekler:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "bozuculuk olasılığı olan bazı seçeneklerin kullanımı iptal edilir" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' seçenekleri birden fazla belirtilemez" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Sıkıştırma seçenekleri çelişiyor" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Bilinmeyen sinyal ismi: %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Tarih örnekleri dosyası bulunamadı" -#: src/tar.c:997 +#: src/tar.c:1017 #, 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:1022 +#: src/tar.c:1042 #, 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:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: dosya listesi zaten okundu" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: okunan dosya ismi boş karakter içeriyor" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style seçeneği için geçerli değerler:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2070,151 +2101,165 @@ msgstr "" "\n" "*Bu* tar için öntanımlılar:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Bloklama çarpanı geçersiz" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Uyarı: -I seçeneği desteklenmiyor; -j ya da -T mi yazacaktınız yoksa?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Kayıt ortamının uzunluğu geçersiz" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Birden fazla eşik tarihi" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Seyrek sürüm değeri geçersiz" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' seçeneği bu platformda desteklenmiyor" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "--checkpoint değeri bir tamsayı değil" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: geçersiz grup" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Seçenekte verilen kip geçersiz" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Sayı geçersiz" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Sahip geçersiz" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Kayıt uzunluğu geçersiz" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Kayıt uzunluğu %d nin katları olmalı" -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Elemen sayısı geçersiz" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Sadece tek bir --to-command seçeneği kullanılabilir" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Hatalı yoğunluk argümanı: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Bilinmeyen yoğunluk: '%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[DOSYA]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Eski seçenek `%c' bir argümanla kullanılır." -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence bir dosya listesi olmaksızın anlamlı değil" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence istenen işlem kipinde kullanılamaz" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Çok sayıda arşiv dosyası `-M' seçeneği gerektirir" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental ile --newer birlikte kullanılamaz" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Çok sayıda bölüm içeren arşivler doğrulanamaz" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Sıkıştırılmış arşivler doğrulanamaz" -#: src/tar.c:2275 +#: src/tar.c:2314 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:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Sıkıştırılmış arşivler birleştirilemez" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option sadece POSIX arşivlerinde kullanılabilir" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Bir boş arşivin oluşturulması ister istemez reddediliyor" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "`-Aru' seçenekleri `-f -' ile uyumsuz" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "`-Acdtrux' seçeneklerinden biri belirtilmeli" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Hata çıkışı önceki hatalardan dolayı gecikti" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2223,79 +2268,79 @@ 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:158 +#: src/xheader.c:156 #, 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:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "%s şablonu kullanılamıyor" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "%s anahtar sözcüğü çakıştırılamaz" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Ek başlık bozuk: uzunluk eksik" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Ek başlık uzunluğu izin verilen aralığın dışında" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "Ek başlık bozuk: uzunluktan sonra boşluk yok" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Ek başlık bozuk: eşit işareti eksik" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Ek başlık bozuk: satırsonu eksik" -#: src/xheader.c:576 +#: src/xheader.c:574 #, 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:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Ek başlık bozuk: %s=%s geçersiz" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, 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:1328 +#: src/xheader.c:1326 #, 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:1338 +#: src/xheader.c:1336 #, 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" @@ -2466,103 +2511,120 @@ msgstr "Numara izin verilen aralığın dışında: %s" msgid "Negative size: %s" msgstr "Negatif boyut: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) başarısız" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Sayı çözümlenirken `%s' civarında hata" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Bilinmeyen tarih biçimi" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ARGÜMANLAR...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "`%s' açılamıyor" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "konumlanamıyor" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "dosya ismi boş karakter içeriyor" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "seyrek dosyalar standart çıktıda üretilemez, --file seçeneğini kullanın" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "kalıp yanlış (`%s' yakınında)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Bilinmeyen alan `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "zaman `%s' olarak ayarlanamaz" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Komut başarıyla sonlandı\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Komut %d çıkış durumu ile başarısız oldu\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Komut %d sinyali ile sonlandırıldı\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Komut %d sinyali ile durduruldu\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Komut bellek dökümü verdi\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Komut sonlandı\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat seçeneği dosya isimleri gerektirir" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "argüman sayısı çok fazla" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "--delay-directory-restore seçeneğinin etkisi iptal edilir." + #~ msgid "block size" #~ msgstr "blok uzunluğu" #~ msgid "[.]NUMBER" #~ msgstr "[.]SAYI" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Hata çıkışı önceki hatalardan dolayı gecikti" diff --git a/po/uk.gmo b/po/uk.gmo index 58216e9726c274cf5d14b6e7433f348ca8d5c6ad..0f1ce5a50c41c66b7b4e7023d5419a6a4c3668c4 100644 GIT binary patch delta 11261 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 dgmRyp=e_%NU+O;Os^mGdbC&Ix`qhRO{|6&\n" "Language-Team: Ukrainian \n" @@ -81,7 +81,7 @@ msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "" "Спробуйте `%s --help' або `%s --usage' для отримання докладнішого опису.\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Про помилки звітуйте на <%s>.\n" @@ -90,15 +90,15 @@ msgstr "Про помилки звітуйте на <%s>.\n" msgid "Unknown system error" msgstr "Невідома системна помилка" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "вивести цю довідку" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "вивести коротке повідомлення про використання" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "НАЗВА" @@ -111,11 +111,11 @@ msgstr "встановити назву програми" msgid "SECS" msgstr "СЕКУНДИ" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "зачекати вказану кількість секунд (типово 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "вивести версію програми" @@ -133,7 +133,7 @@ msgstr "%s: Забагато аргументів\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(ПОМИЛКА ПРОГРАМУВАННЯ) Опція мала бути розпізнана!?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "помилка запису" @@ -192,16 +192,16 @@ msgstr "%s: опція `-W %s' неоднозначна\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: опція `-W %s' не може мати аргументу\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "пам'ять вичерпана" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "не вдається змінити поточний каталог" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "не вдається зберегти поточний каталог" @@ -323,11 +323,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[yYтТ]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[nNнН]" @@ -549,66 +561,58 @@ msgstr "Передчасне закінчення файла" msgid "Garbage command" msgstr "Хибна команда" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Це не схоже на архів tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Записано загалом" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Прочитано байтів загалом" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Видалено загалом: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Недійсне значення record_size" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Не вказано назви архіву" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Неможливо перевіряти архів, записаний до stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архів стиснений. Використовуйте опцію %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Не можна оновлювати стиснені архіви" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "На початку стрічки, закінчуємо" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Надто багато помилок, виконання перервано" -#: src/buffer.c:678 -#, 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:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -616,39 +620,47 @@ msgstr[0] "Розмір запису = %lu блок" msgstr[1] "Розмір запису = %lu блоки" msgstr[2] "Розмір запису = %lu блоків" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, 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:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Не вдалося переміститись назад у архіві; можливо архів не можна прочитати " "без опції -i" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не зупинився на межі запису" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: містить невірний номер тому" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Переповнення номера тому" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Підготуйте том #%d архіву %s ї натиснить return: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "Кінець файлу, замість очікуваної відповіді" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "ПОПЕРЕДЖЕННЯ: Незавершений архів" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -659,65 +671,66 @@ msgstr "" " q Перервати роботу\n" " у або новий рядок Продовжувати\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Викликати оболонку\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? Вивести цю довідку\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Новий том відсутній. Завершення.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "Не вказано назви файлу. Спробуйте ще раз.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Недійсні вхідні дані. Наберіть ? щоб отримати підказку.\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "збій виконання `%s'" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s можливо продовжується у цьому томі: заголовок містить обрізану назву" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продовжується у цьому томі" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s є неправильним розміром (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Цей том є за межами послідовності" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Назви тому відсутня в архіві. Не можна порівняти з %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Етикетка тому %s не співпадає з %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -725,6 +738,11 @@ msgstr "" "%s: назва файлу надто довга щоб зберегти її у заголовку тому GNU; назву " "обрізано" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek не зупинився на межі запису" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -737,8 +755,8 @@ msgstr[2] "Вдалося прочитати тільки %lu з %lu байті msgid "Contents differ" msgstr "Різниця у змісті" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Неочікуваний кінець файла в архіві" @@ -858,7 +876,7 @@ msgstr[2] "%s: Файл скоротився на %s байтів; заповн msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл знаходиться в іншої файлової системі; не архівується" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "вміст не архівується" @@ -887,7 +905,7 @@ msgstr "%s: файл є архівом; не архівується" msgid "%s: File removed before we read it" msgstr "%s: Файл було видалено перед тим як tar встиг його прочитати" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "каталог не архівується" @@ -939,168 +957,168 @@ msgstr "%s: Каталог перейменовано перед тим, як ta msgid "Extracting contiguous files as regular files" msgstr "Витягування безперервних файлів у звичайні" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "Спроба перетворити символічні посилання на жорсткі" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Зчитування %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Не вдається витягнути -- файл починається в іншому томі" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Неочікуваний кінець файла у заголовку довгої назви" -#: src/extract.c:1159 +#: src/extract.c:1156 #, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s: Невідомий тип файлу `%c', спроба витягнути його як звичайний файл" # FIXME: або сучасний? -#: src/extract.c:1184 +#: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" msgstr "Існуючий файл `%s' є новіший" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Не вдалося створити резервну копію цього файла" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Не вдається перейменувати %s на %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Невиправна помилка: завершення роботи" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталог перейменовано з %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталог перейменовано" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: Новий каталог" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Невірний час файлу" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Невірна дата модифікації (секунди)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Недійсний час модифікації (наносекунди)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Невірний номер пристрою" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Невірний номер і-вузла" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "З файла-знімка прочитано надто довге поле" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Помилка читання файла-знімка" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" msgstr "Неочікуваний кінець файла-знімка" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Неочікуваний кінець файла-знімка" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Бракує ознаки кінця запису" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Неправильний формат файла знімку" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "Такий інкрементний формат не підтримується: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Неправильно сформований dumpdir: очікувалося '%c' натомість знайдено %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Неправильно сформований dumpdir: 'X' вказаний двічі" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Невірний формат dumpdir: пуста назва у `R'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Невірний формат dumpdir: `T' без попереднього `R'" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Невірний формат dumpdir: пуста назва у `T'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Невірний формат dumpdir: очікувалося `%c', натомість знайдено кінець файла" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "Невірний формат dumpdir: `X' не використаний" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Не вдається створити тимчасовий каталог використовуючи шаблон %s" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не очищується: не вдалося виконати stat" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог знаходиться на іншому пристрої: не очищується" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Стирання %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Не вдається видалити" @@ -1120,19 +1138,19 @@ msgstr "блок %s: ** Містить нулі **\n" msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Кінець файлу **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1140,17 +1158,17 @@ msgstr "" "вважається, що це є двійкове доповнення" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Вісімкове значення %.*s знаходиться поза межами діапазону типу %s" # FIXME: base=64? -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "Архів містить застарілі заголовки з основою 64" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" @@ -1158,54 +1176,54 @@ msgstr "" "типу %s" # FIXME: base-256 -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Значення %s поза допустимими межами типу %s %s..%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr "посилання до %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr "невідомий тип файла %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Довге посилання--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Довга назва--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Заголовок тому--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продовжується з байту %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Створення каталогу:" @@ -1242,25 +1260,25 @@ msgstr "канал між процесами" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Назви файлів містять символи-шаблони. Будь ласка, користайтеся" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" "опцією --wildcards аби увімкнути шаблони, або опцією --no-wildcards, щоб" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "усунути це повідомлення." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Не знайдено в архіві" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Потрібну копію у архіві не знайдено" @@ -1287,7 +1305,7 @@ msgstr "" "Невідомий стиль цитування `%s'. Наберіть `%s --quoting-style=help' аби " "отримати перелік стилів." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1306,7 +1324,7 @@ msgstr "" " # archive.tar\n" " tar -xf archive.tar # Витягує усі файли з archive.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1328,88 +1346,88 @@ msgstr "" " інакше - прості\n" " never, simple завжди створювати прості резервні копії\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Режими роботи:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "вивести вміст архіву" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "витягнути файли з архіву" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "створити новий архів" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "порівняти файли в архіві з файлами у файлової системі" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "долучити файли до існуючого архіву" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "долучати тільки такі файли, що є новішими за їх копії в архіві" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "долучити архів до архіву" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "видалити файли з архіву (не на стрічці!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "перевірити мітку тому та вийти" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Модифікатори режиму роботи:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "заощаджувати простір під час зберігання розсіяних файлів" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "ГОЛОВНИЙ[.ДРУГОРЯДНИЙ]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "встановлює версію формату розсіяних файлів (вмикає --sparse)" # FIXME: incremental -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "обробка старого формату інкрементного архіву GNU" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "обробка нового формату інкрементного архіву GNU" # FIXME: хммм... -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "ігнорувати помилки читання файлів" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "ЧИСЛО" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1421,118 +1439,118 @@ msgstr "" "з переліком файлів (у командному рядку або за допомогою опції -T). Типове " "ЧИСЛО: 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "архів підтримує операцію seek" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Керування перезаписом:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "перевірити архів після запису в нього" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "видаляти файли після додавання до архіву" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "не заміняти існуючи файли під час витягування" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "не заміняти існуючи файли що є новішими за їх копії у архіві" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "перезаписувати існуючі файли під час витягування" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "видаляти кожний файл перед витягуванням його копії" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "спорожняти старий каталог перед витягуванням його копії з архіву" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "зберігати мета-дані існуючих каталогів" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "перезаписувати метадані існуючих каталогів під час витягування (типово)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Вибір вихідного потоку:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "витягувати файли у стандартний вивід" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" msgstr "передавати витягнуті файли до стандартного вводу іншої програми" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "ігнорувати коди завершення процесів-нащадків" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "вважати ненульовий код завершення нащадка помилкою" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Обробка атрибутів файлу:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "встановлення вказаного користувача власником доданих файлів" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "встановлення групи з вказаною назвою групою власника доданих файлів" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "ДАТА-АБО-ФАЙЛ" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" msgstr "встановлення часу останньої зміни доданих файлів" # Ну, і чому це CHANGES?? -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "ПРАВА" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "встановлення вказаних символічно прав доступу для доданих файлів" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1542,29 +1560,29 @@ msgstr "" "читання (типово, МЕТОД='replace'), або через запобігання оновленню часу " "(МЕТОД='system')" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "не витягувати час модифікації файлів" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "витягувати назву власника файлів" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "стати власником витягнутих файлів" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "завжди використовувати числа замість назв власника/групи" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" "встановлювати права доступу згідно з даними архіву (типово для супер-" "користувача)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1572,15 +1590,15 @@ msgstr "" "встановлювати права доступу згідно зі значенням umask (типово для звичайного " "користувача)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "витягувати файли у порядку їх з'явлення в архіві" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "те ж, що -p -s разом" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1588,139 +1606,139 @@ msgstr "" "затримати встановлення часу модифікації та прав доступу до каталогів до " "кінця витягування" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "відмінити дії опції --delay-directory-restore" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Вибір та зміна пристрою:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "АРХІВ" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "використовувати вказаний файл або пристрій" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "файл архіву є локальним, навіть якщо його назва містить двокрапку" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "використовувати вказану команду замість rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "використовувати вказану команду замість rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "визначає пристрой та густину" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "створити, виводити зміст або витягувати файли з багатотомного архіву" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "змінити стрічку після запису ЧИСЛА x 1024 байтів" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "запускати сценарій наприкінці кожної стрічки (вмикає -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "використовувати/обновляти номер тому у ФАЙЛІ" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Блокування пристрою:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "ЧИСЛО-БЛОКІВ" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "розмір запису ЧИСЛО-БЛОКІВ x 512 байтів" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "встановити розмір запису у блоках по 512 байтів" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ігнорувати нульові блоки в архіві (звичайно вказують кінець файлу)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "розбивати на блоки під час читання (для каналів 4.2BSD)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Вибір формату архіву:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "створити архів у вказаному форматі" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "ФОРМАТ будь-який з наступних:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "старий формат V7" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "формат GNU, сумісний з версією tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "формат GNU, сумісний з версією tar 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "те ж, що і pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "те ж, що і --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "те ж, що і --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ключове_слово[[:]=значення][,ключове_слово[[:]=значення], ...]\"" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "керування ключовими словами pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1728,85 +1746,99 @@ msgstr "" "створити архів з назвою тому \"ТЕКСТ\". Під час виводу змісту або " "витягування, використовувати ТЕКСТ як шаблон пошуку тому" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Опції стиснення:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "вибирати програму стиснення за суфіксом архіву" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "вибирати програму стиснення за суфіксом архіву" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "використовувати bzip2 для стиснення/розтискання архіву" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "використовувати gzip для стиснення/розтискання архіву" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "використовувати compress для стиснення/розтискання архіву" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "використовувати lzma для стиснення/розтискання архіву" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "використовувати gzip для стиснення/розтискання архіву" + +#: src/tar.c:613 msgid "PROG" msgstr "ПРОГРАМА" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "використовувати ПРОГРАМУ для стиснення/розтискання архіву" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Вибір файлів:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "долучити ФАЙЛ до архіву (корисне, якщо його назва починається з -)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "КАТАЛОГ" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "перейти до вказаного каталогу" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" msgstr "читати назви файлів для додання/витягування з вказаного файла" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "" "файл, вказаний з опцією -T, містить назви, відокремлені нульовими символами. " "Ця опція вимикає -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "усувати цитування з назв файлів прочитаних за допомогою -T (типово)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "не усувати цитування з назв файлів прочитаних за допомогою -T" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "ШАБЛОН" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "не обробляти файли, назви яких відповідають вказаному шаблону" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "виключити назви що відповідають шаблонам, вказаним у файлі" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1814,88 +1846,88 @@ msgstr "" "не архівувати файли в каталогах, що містять CACHEDIR.TAG, з винятком самого " "файлу" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "не архівувати жодні файли в каталогах, що містять CACHEDIR.TAG" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" msgstr "не архівувати каталоги, що містять CACHEDIR.TAG" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "не архівувати файли в каталогах, що містять ФАЙЛ, з винятком самого файлу" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" msgstr "не архівувати жодні файли в каталогах, що містять ФАЙЛ" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "не архівувати каталоги, що містять ФАЙЛ" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "не архівувати каталоги систем керування версіями" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "не заходити автоматично у каталоги" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "залишатися у локальної файлової системі під час створення архіву" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "рекурсивно проходити каталоги (типово)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "не видаляти початкову косу риску `/' з назв файлів" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "Йти за символьними посиланнями: долучати файли, на яки вони вказують" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "Йти за жорсткими посиланнями: долучати файли, на яки вони вказують" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "НАЗВА-ФАЙЛУ" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "починати обслуговування архіву з вказаного файлу" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "долучати тільки такі файли, що є новіші за вказану дату або файл" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "порівнювати тільки дату і час зміни даних" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "РЕЖИМ" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "перед видаленням створювати резервні файли у вказаному режимі" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "РЯДОК" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1903,90 +1935,90 @@ msgstr "" "перед видаленням створювати резервні файли з указаним суфіксом (типово '~', " "якщо не перевизначено змінною середовища SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Перетворювання назв файлів:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" msgstr "видаляти вказане ЧИСЛО компонентів з початку назв файлів" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "ВИРАЗ" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "перетворювати назви файлів за допомогою вказаного виразу заміни" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Керування порівнюванням назв (впливає на взірці як вилучення, так і " "долучення):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" msgstr "шаблони ігнорують відмінності у регістрі символів" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" msgstr "порівнювати шаблони з назвами файлів починаючи від початку назви" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" msgstr "" "порівнювати шаблони з назвами файлів починаючи від будь-якого / (типово)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "шаблони враховують регістр (типово)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "користатися шаблонами (типово для вилучення)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "порівнювати назви буквально" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "шаблони не стосуються до '/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "шаблони стосуються до '/' (типово)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Інформативний вивід:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "виводити докладну інформацію про оброблені файли" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" msgstr "виводити контрольне повідомлення кожне ЧИСЛО записів (типово 10)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "ДІЯ" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "виконати вказану дію у контрольному пункті" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "виводити повідомлення якщо до архіву було додано не всі посилання" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1997,27 +2029,27 @@ msgstr "" "- друкувати статистику по отриманню цього сигналу; дозволеними сигналами є " "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 і SIGUSR2, а також ці назви без префікса SIG" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "друкувати час модифікації файлів у UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "виводити детальну інформацію у ФАЙЛ" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "попереджувати кожне повідомлення номером блоку в архіві" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "Запитувати підтвердження кожної дії" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "вивести типові налаштування" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2025,31 +2057,31 @@ msgstr "" "під час виведення змісту або витягування файлів друкувати назви каталогів що " "не відповідають критеріям пошуку" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "показувати перетворені назви файлів" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "встановити стиль цитування; дозволені стилі див. нижче" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "цитувати також вказані символи" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "вимкнути цитування вказаних символів" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Опції сумісності:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2057,56 +2089,56 @@ msgstr "" "під час створення архіву, те ж саме, що і --old-archive. Під час " "витягування, те ж саме, що --no-same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Інші опції:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "заборонити користування деякими потенційно небезпечними опціями" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Не можна вказувати більш ніж одну з опцій `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Опції стиснення конфліктують одна з другою" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Невідомий тип файла %s" -#: src/tar.c:989 +#: src/tar.c:1009 msgid "Date sample file not found" msgstr "Не знайдено файл-зразок дати" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Використовується %s замість невідомого формату дати %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Опція %s: Дату `%s' сприйнято як %s" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: перелік файлів уже прочитано" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: прочитана назва файла містить нульовий символ" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Допустимими аргументами опції --quoting-style є:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2114,111 +2146,117 @@ msgstr "" "\n" "Типові налаштування *цієї* копії програми:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Неправильний фактор блокування" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "" "Попередження: опція -I не підтримується. Можливо ви маєте на увазі -j або -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Неправильна довжина стрічки" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Більш ніж одна гранична дата" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Недійсна версія формату розсіяних файлів" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "опція --atime-preserve='system' не підтримується на цій платформі" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "аргумент --checkpoint мусить бути цілим числом" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Невірна група" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Невірний формат прав доступу" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Невірне число" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Невірний власник" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Невірний розмір запису" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "Розмір запису має ділитися на %d." -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Невірна кількість елементів" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Дозволяється лише одна опція --to-command" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Невірний аргумент вказання густини: `%s'" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Невідома густина: `%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Опції `-[0-7][lmh]' не підтримуються *цією* версією tar" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Стара опція `%c' потребує аргументу" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "вказання --occurrence не має сенсу без вказання переліку файлів" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" "опцію --occurrence не можна використовувати у зазначеному режимі роботи" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Вказання декількох файлів потребує вказання опції `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Не можна використовувати --listed-incremental разом з --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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)" @@ -2226,42 +2264,50 @@ msgstr[0] "%s: Мітка тому є надто довга (обмеження msgstr[1] "%s: Мітка тому є надто довга (обмеження в %lu байти)" msgstr[2] "%s: Мітка тому є надто довга (обмеження в %lu байтів)" -#: src/tar.c:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Не можна перевіряти багатотомні архіви" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Не можна перевіряти стиснені архіви" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Не можна використовувати стиснення багатотомних архівів" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Не можна з'єднувати стиснені архіви" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "Опція --pax-option використовується тільки з архівами у форматі POSIX" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Полохливо відмовляюся створювати пустий архів" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Опції `-Aru' не сумісні з `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Необхідно вказати одну з опцій `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Вихід з помилкою є викликаний попередніми помилками" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2271,84 +2317,84 @@ msgstr[0] "%s: Файл скоротився на %s байт" msgstr[1] "%s: Файл скоротився на %s байти" msgstr[2] "%s: Файл скоротився на %s байтів" -#: src/xheader.c:158 +#: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Ключове слово %s не є відоме або ще не реалізоване" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Шаблон %s забороняється уживати" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Не можна перевизначити ключове слово %s" -#: src/xheader.c:498 +#: src/xheader.c:496 msgid "Malformed extended header: missing length" msgstr "Невірно сформований розширений заголовок: бракує довжини" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "Довжина розширеного заголовку є за межами діапазону" -#: src/xheader.c:513 +#: src/xheader.c:511 #, c-format msgid "Extended header length %*s is out of range" msgstr "Довжина розширеного заголовку %*s є за межами діапазону" -#: src/xheader.c:525 +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" msgstr "" "Невірно сформований розширений заголовок: відсутній пробіл після довжини" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "Невірно сформований розширений заголовок: відсутній знак рівняння" -#: src/xheader.c:539 +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" msgstr "Невірно сформований розширений заголовок: відсутній знак нового рядка" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Невідоме ключове слово `%s' іґнорується" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" "Значення розширеного заголовку %s=%s лежить поза допустимими межами типу %s.." "%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Невірно сформований розширений заголовок: недійсна змінна %s=%s" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Невірно сформований розширений заголовок: зайвий %s=%s" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Невірно сформований розширений заголовок: змінна %s: неочікуваний розділювач " "%c" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Невірно сформований розширений заголовок %s: непарна кількість значень" @@ -2518,102 +2564,119 @@ msgstr "Число поза допустимими межами: %s" msgid "Negative size: %s" msgstr "Від'ємний розмір: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "збій виконання stat(%s)" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Помилка розбору числа біля `%s'" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Невідомий формат дати" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[АРГУМЕНТИ...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "не вдається відкрити `%s'" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "не вдається виконати lseek" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "назва файла містить нульовий символ" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "неможливо створювати розсіяні файли на стандартному виводі; користайтеся " "опцією --file" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "недійсна маска (біля `%s')" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Невідоме поле `%s'" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "не вдається встановити час файла `%s'" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Команда завершилася успішно\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Команда завершилася з кодом %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Команда завершилася по сигналу %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Команда зупинилася по сигналу %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Команда скинула відбиток пам'яті\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Команда завершилася\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "опція --stat вимагає назв файлів" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "забагато аргументів" +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "відмінити дії опції --delay-directory-restore" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Вихід з помилкою є викликаний попередніми помилками" + #~ msgid "block size" #~ msgstr "розмір блока" diff --git a/po/vi.gmo b/po/vi.gmo index 41a118fd0c0c4f7a7f82873677b07d4b7d2adb1a..583b0dd584a940d31665b992c1699233b00a5e03 100644 GIT binary patch delta 9552 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 Vd}Z&FYK2c6&n{aS^6A6C{{kLhwYdNQ diff --git a/po/vi.po b/po/vi.po index ac23dd0..aeca325 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,22 +1,22 @@ # Vietnamese translation for Tar. # Copyright © 2008 Free Software Foundation, Inc. -# This file is distributed under the same license as the tar-1.19.90 package. +# This file is distributed under the same license as the tar-1.20 package. # Phan Vinh Thinh , 2005. # Clytie Siddall , 2007-2008. # msgid "" msgstr "" -"Project-Id-Version: tar 1.19.90\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2008-02-09 11:37+1030\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-04-15 22:28+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b1\n" +"X-Generator: LocFactoryEditor 1.7b3\n" #: lib/argmatch.c:133 #, c-format @@ -83,7 +83,7 @@ msgstr " [TÙY CHỌN...]" 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" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "Báo cáo lỗi tới %s.\n" @@ -92,15 +92,15 @@ msgstr "Báo cáo lỗi tới %s.\n" msgid "Unknown system error" msgstr "Lỗi hệ thống không rõ" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" msgstr "hiển thị trợ giúp này" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" msgstr "hiển thị cách sá»­ dụng ngắn gọn" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "TÊN" @@ -113,11 +113,11 @@ msgstr "đặt tên chÆ°Æ¡ng trình" msgid "SECS" msgstr "GIÂY" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "treo trong vòng GIÂY giây (mặc định 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" msgstr "In ra phiên bản chÆ°Æ¡ng trình" @@ -135,7 +135,7 @@ msgstr "%s: Quá nhiều đối số\n" 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 !?" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "lỗi ghi" @@ -194,16 +194,16 @@ msgstr "%s: tùy chọn `-W %s' không rõ ràng\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: tùy chọn `-W %s' không yêu cầu một tham số\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "cạn bộ nhớ" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" msgstr "Không thể thu thÆ° mục làm việc hiện thời" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, c-format msgid "failed to return to initial working directory" msgstr "không trở được về thÆ° mục làm việc đầu tiên" @@ -319,11 +319,23 @@ msgstr "`" msgid "'" msgstr "'" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "^[cCyY]" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "^[kKnN]" @@ -547,100 +559,100 @@ msgstr "Kết thúc sớm của tập tin" msgid "Garbage command" msgstr "Câu lệnh rác" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Đây có vẻ không phải là một tập tin lÆ°u trữ tar" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" msgstr "Tổng số byte đã ghi" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "Tổng số byte đã đọc" -#: src/buffer.c:344 +#: src/buffer.c:363 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Tổng số byte đã xoá: %s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(đường ống)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "Giá trị cho record_size không đúng" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "Không đưa ra tên tập tin lÆ°u trữ" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "Không kiểm tra được tập tin lÆ°u trữ stdin/stdout" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Tập tin lÆ°u trữ được nén. Hãy sá»­ dụng tùy chọn %s" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "Không cập nhật được lÆ°u trữ đã nén" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "Tại đầu băng ghi âm, thoát ra bây giờ" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "Quá nhiều lỗi, đang thoát" -#: src/buffer.c:678 +#: src/buffer.c:695 #, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" +msgid "Record size = %lu block" +msgid_plural "Record size = %lu blocks" msgstr[0] "Khối chÆ°a sắp hàng (%lu byte) trong tập tin lÆ°u trữ" -#: src/buffer.c:698 +#: src/buffer.c:716 #, c-format -msgid "Record size = %lu block" -msgid_plural "Record size = %lu blocks" +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 tập tin lÆ°u trữ" -#: src/buffer.c:771 +#: src/buffer.c:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Không thể \"tua\" lại tập tin lÆ°u trữ; nó có thể đọc khi không có -i" -#: src/buffer.c:803 +#: src/buffer.c:825 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:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: chứa số thứ tá»± khối không đúng" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "Số thứ tá»± khối thừa ra" -#: src/buffer.c:909 +#: src/buffer.c:929 #, 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:915 +#: src/buffer.c:935 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" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "CẢNH BÁO: Tập tin lÆ°u trữ không hoàn thành" -#: src/buffer.c:934 +#: src/buffer.c:954 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -651,64 +663,65 @@ msgstr "" " q Dừng tar\n" " y hay dòng mới\tTiếp tục lại chạy tiến trình\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Tạo một trình bao con\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr " ? In ra danh sách này\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "Không có khối mới; đang thoát.\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "ChÆ°a ghi rõ tên tập tin: hãy thá»­ lại.\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Gõ sai. (Gỏ ? để xem trợ giúp.)\n" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, c-format msgid "%s command failed" msgstr "Câu lệnh %s không thành công" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, 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:1203 +#: src/buffer.c:1223 #, 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:1217 +#: src/buffer.c:1237 #, 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:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Khối này vượt quá dãy cho phép" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "Tập tin lÆ°u trữ không có nhãn tÆ°Æ¡ng ứng với %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "Khối %s không tÆ°Æ¡ng ứng %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -716,6 +729,11 @@ 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:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek không dừng lại tại một ranh giới bản ghi" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -726,8 +744,8 @@ msgstr[0] "Chỉ đọc được %lu từ %lu byte" msgid "Contents differ" msgstr "Diff nội dung" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Kết thúc tập tin không mong đợi trong lÆ°u trữ" @@ -843,7 +861,7 @@ msgstr[0] "%s: Tập tin được rút ngắn %s byte; độn vào bắng các s 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:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "chÆ°a đổ nội dung" @@ -872,7 +890,7 @@ msgstr "%s: tập tin là một lÆ°u trữ; không được dump" 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/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" msgstr "chÆ°a đổ thÆ° mục" @@ -923,165 +941,165 @@ msgstr "%s: Đổi tên thÆ° mục trước khi có thể giải phóng trạng 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" -#: src/extract.c:1000 +#: src/extract.c:997 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" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "Đọc %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, 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" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" msgstr "Phần đầu tên dài không mong đợi" -#: src/extract.c:1159 +#: src/extract.c:1156 #, 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" -#: src/extract.c:1184 +#: src/extract.c:1181 #, 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" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s: Không thể sao lÆ°u tập tin này" -#: src/extract.c:1358 +#: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" msgstr "Không thể đổi tên %s thành %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "Lỗi không thể phục hồi: thoát bây giờ" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Đã đổi tên thÆ° mục từ %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Đã đổi tên thÆ° mục" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s: ThÆ° mục là mới" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "Tem thời gian không đúng" -#: src/incremen.c:889 +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" msgstr "Thời gian sá»­a đổi không hợp lệ (giây)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "Thời gian sá»­a đổi không hợp lệ (nanô-giây)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "Số thứ tá»± thiết bị không đúng" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "Số thứ tá»± chỉ mục inode sai" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "Trường quá dài trong khi đọc tập tin ảnh chụp" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "Lỗi đọc trong tập tin ảnh chụp" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 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" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "Giá trị trường không mong đợi trong tập tin ảnh chụp" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "Thiếu dấu giới hạn mục ghi" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "Định dạng tập tin dần sai" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, 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:1369 +#: src/incremen.c:1429 #, 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" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "ThÆ° mục đổ dạng sai: « X » đã nhân đôi" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" msgstr "ThÆ° mục đổ dạng sai: tên rỗng trong « R »" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "ThÆ° mục đổ dạng sai: « T » không có « R » đi trướ" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" msgstr "ThÆ° mục đổ dạng sai: tên rỗng trong « T »" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, 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" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "ThÆ° mục đổ dạng sai: « X » không bao giờ dùng" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, 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:1543 +#: src/incremen.c:1603 #, 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:1556 +#: src/incremen.c:1616 #, 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:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Đang xóa %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s: Không thể xóa bỏ" @@ -1101,87 +1119,87 @@ msgstr "khối %s: ** Khối của các số không (NUL) **\n" msgid "block %s: ** End of File **\n" msgstr "khối %s: ** Kết thúc tập tin **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "khối %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:717 +#: src/list.c:726 #, 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 lÆ°u trữ 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Giá trị hệ tám %.*s của lÆ°u trữ vượt ra phạm vi %s" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "LÆ°u trữ chứa phần đầu base-64 không còn dùng nữa" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "LÆ°u trữ ký chuỗi base-64 %s vượt ra ngoài vùng %s" -#: src/list.c:794 +#: src/list.c:803 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Giá trị base-256 của lÆ°u trữ vượt ra ngoài vùng %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:823 +#: src/list.c:832 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "LÆ°u trữ chứa %.*s ở chỗ mong đợi giá trị số %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:845 +#: src/list.c:854 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Giá trị lÆ°u trữ %s vượt quá phạm vi %s (%s..%s)" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " liên kết tới %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " dạng tập tin không rõ %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--Liên kết Dài--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--Tên Dài--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--Phần đầu Khối--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Tiếp tục tại byte %s--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "Đang tạo thÆ° mục:" @@ -1218,24 +1236,24 @@ msgstr "kênh (channel) giữa các tiến trình" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "Tên tập tin chứa ký tá»± khớp mẫu." -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "Hãy dùng « --wildcards » để hiệu lá»±c khớp mẫu," -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "hoặc dùng « --no-wildcards » để thu hồi cảnh báo này." -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s: Không tìm thấy trong lÆ°u trữ" -#: src/names.c:621 +#: src/names.c:615 #, 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 lÆ°u trữ" @@ -1262,7 +1280,7 @@ 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." -#: src/tar.c:334 +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1282,7 +1300,7 @@ msgstr "" "kho.tar.\n" " tar -xf kho.tar # Giải phóng tất cả các tập tin ra từ kho.tar.\n" -#: src/tar.c:343 +#: src/tar.c:345 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 " @@ -1303,86 +1321,86 @@ msgstr "" " nil, existing đánh số nếu lÆ°u trữ tồn tại, nếu không thì đơn giản\n" " never, simple luôn luôn tạo lÆ°u trữ đơn giản\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "Chế độ thao tác chính:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "liệt kê nội dung của một lÆ°u trữ" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "giải phóng các tập tin từ một lÆ°u trữ" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "tạo một lÆ°u trữ mới" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "tìm sá»± khác nhau giữa lÆ°u trữ và hệ thống tập tin" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "thêm các tập tin vào cuối một lÆ°u trữ" -#: src/tar.c:384 +#: src/tar.c:386 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 lÆ°u trữ" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "thêm các tập tin tar vào một lÆ°u trữ" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "xóa từ lÆ°u trữ (không dùng trên các băng ghi âm mag!)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "thá»­ nhãn khối tin lÆ°u trữ rồi thoát" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "Từ khóa bổ nghÄ©a thao tác:" -#: src/tar.c:399 +#: src/tar.c:401 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:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "CHÍNH[.PHỤ]" -#: src/tar.c:401 +#: src/tar.c:403 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 »)" -#: src/tar.c:403 +#: src/tar.c:405 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:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "TẬP TIN" -#: src/tar.c:405 +#: src/tar.c:407 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:407 +#: src/tar.c:409 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:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "SỐ" -#: src/tar.c:409 +#: src/tar.c:411 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, --" @@ -1399,117 +1417,117 @@ msgstr "" "T ».\n" "Mặc định SỐ có giá trị bằng 1." -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" msgstr "có thể tìm nÆ¡i trong kho lÆ°u trữ" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "đừng kiểm tra số thứ tá»± thiết bị khi tạo kho nén dần" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" -msgstr "" +msgstr "kiểm tra số thứ tá»± thiết bị khi tạo kho nén dần" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "Điều khiển ghi đè:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "thá»­ kiểm tra lÆ°u trữ sau khi ghi nó" -#: src/tar.c:431 +#: src/tar.c:433 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 lÆ°u trữ" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "không thay thế những tập tin đã có khi giải phóng" -#: src/tar.c:435 +#: src/tar.c:437 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 lÆ°u trữ" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "ghi đè lên những tập tin đã có khi giải phóng" -#: src/tar.c:439 +#: src/tar.c:441 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ó" -#: src/tar.c:441 +#: src/tar.c:443 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" -#: src/tar.c:443 +#: src/tar.c:445 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:445 +#: src/tar.c:447 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)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "Chọn luồng xuất:" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "giải phóng tập tin ra đầu ra tiêu chuẩn" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "CÂU LỆNH" -#: src/tar.c:456 +#: src/tar.c:458 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" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "bỏ qua mã thoát của tiến trình con" -#: src/tar.c:460 +#: src/tar.c:462 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:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "Điều khiển thuộc tính tập tin:" -#: src/tar.c:468 +#: src/tar.c:470 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:470 +#: src/tar.c:472 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:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "NGÀY-CỦA-TẬP-TIN" -#: src/tar.c:472 +#: src/tar.c:474 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" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "THAY ĐỔI" -#: src/tar.c:474 +#: src/tar.c:476 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" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "PHƯƠNG PHÁP" -#: src/tar.c:477 +#: src/tar.c:479 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 " @@ -1519,29 +1537,29 @@ msgstr "" "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')" -#: src/tar.c:481 +#: src/tar.c:483 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" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "thá»­ giải phóng tập tin với cùng quyền sở hữu" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "giải phóng tập tin nhÆ° tá»± bạn" -#: src/tar.c:487 +#: src/tar.c:489 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:489 +#: src/tar.c:491 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 " "dùng)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1549,15 +1567,15 @@ 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 trữ " "(mặc định cho người dùng bình thường)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "sắp xếp tên để giải phóng tới lÆ°u trữ tÆ°Æ¡ng ứng" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "giống nhÆ° khi có hai tùy chọn -p và -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1565,139 +1583,139 @@ 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" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "hủy hiệu ứng của tùy chọn « --delay-directory-restore »" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "Lá»±a chọn và chuyển đổi thiết bị:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "LƯU TRá»®" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "sá»­ dụng tập tin lÆ°u trữ hoặc thiết bị LƯU TRá»®" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" msgstr "tập tin lÆ°u trữ là nội bộ thậm chí nếu có một dấu hai chấm" -#: src/tar.c:515 +#: src/tar.c:517 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:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "sá»­ dụng CÂU LỆNH từ xa thay cho rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "chỉ ra ổ và mật độ ghi dữ liệu" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "tạo/liệt kê/giải phóng lÆ°u trữ nhiều khối" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "thay băng ghi âm (tape) sau khi ghi nhớ SỐ X 1024 byte" -#: src/tar.c:539 +#: src/tar.c:541 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:542 +#: src/tar.c:544 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" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "Khối của thiết bị:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "KHỐI" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "KHỐI X 512 byte cho mỗi bản ghi" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" msgstr "SỐ byte cho mỗi mục ghi, bội số cho 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "lờ đi những khối không (zero) trong lÆ°u trữ (có nghÄ©a EOF)" -#: src/tar.c:556 +#: src/tar.c:558 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:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "Lá»±a chọn định dạng lÆ°u trữ:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "ĐỊNH DẠNG" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" msgstr "tạo lÆ°Æ° trữ với định dạng đưa ra" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "ĐỊNH DẠNG là một trong số sau:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "định dạng tar V7 cÅ©" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "định dạng GNU theo nhÆ° tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "định dạng tar GNU 1.13.x" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "định dạng PoSIX 1003.1-1988 (ustar)" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "định dạng POSIX 1003.1-2001 (pax)" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" msgstr "bằng pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "giống nhÆ° --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "giống nhÆ° --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "từ_khoá[[:]=giá_trị][,từ_khoá[[:]=giá_trị]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "từ khóa điều khiển pax" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "VĂN BẢN" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1705,84 +1723,98 @@ msgstr "" "tạo lÆ°u trữ 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" -#: src/tar.c:592 +#: src/tar.c:594 msgid "Compression options:" msgstr "Tùy chọn nén:" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "dùng hậu tố lÆ°u trữ để xác định chÆ°Æ¡ng trình nén" -#: src/tar.c:596 +#: src/tar.c:598 +#, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "dùng hậu tố lÆ°u trữ để xác định chÆ°Æ¡ng trình nén" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "lọc lÆ°u trữ qua bzip2" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "lọc lÆ°u trữ qua gzip" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "lọc lÆ°u trữ qua compress" -#: src/tar.c:605 +#: src/tar.c:610 msgid "filter the archive through lzma" msgstr "lọc lÆ°u trữ qua lzma" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "lọc lÆ°u trữ qua gzip" + +#: src/tar.c:613 msgid "PROG" msgstr "TRÌNH" -#: src/tar.c:607 +#: src/tar.c:614 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:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "Lá»±a chọn tập tin nội bộ:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "thêm vào kho lÆ°u trữ TẬP TIN đã cho (có ích nếu tên nó bắt đầu với dấu gạch)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "THƯ MỤC" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "thay đổi tới thÆ° mục THƯ MỤC" -#: src/tar.c:619 +#: src/tar.c:626 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" -#: src/tar.c:621 +#: src/tar.c:628 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:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 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:625 +#: src/tar.c:634 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:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "MẪU" -#: src/tar.c:627 +#: src/tar.c:636 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:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "loại trừ những mẫu liệt kê trong TẬP TIN" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1790,88 +1822,88 @@ 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:634 +#: src/tar.c:643 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:637 +#: src/tar.c:646 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:639 +#: src/tar.c:648 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ó" -#: src/tar.c:642 +#: src/tar.c:651 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" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" msgstr "loại trữ thÆ° mục chứa TẬP TIN" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "trừ thÆ° mục của hệ thống điều khiển phiên bản (v.d. « .svn »)" -#: src/tar.c:648 +#: src/tar.c:657 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:650 +#: src/tar.c:659 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 lÆ°u trữ" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "đệ quy vào các thÆ° mục (mặc định)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "đừng bỏ `/' ở đầu tên tập tin" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "theo liên kết tượng trÆ°ng; lÆ°u trữ và đổ tập tin tới đó nó chỉ" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "theo liên kết cứng; lÆ°u trữ và đổ tập tin tới đó nó chỉ" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "TÊN-THÀNH-VIÊN" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "bắt đầu tại thành viên TÊN-THÀNH-VIÊN trong lÆ°u trữ" -#: src/tar.c:662 +#: src/tar.c:671 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:664 +#: src/tar.c:673 msgid "DATE" msgstr "NGÀY" -#: src/tar.c:665 +#: src/tar.c:674 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:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "ĐIỀU KHIỂN" -#: src/tar.c:667 +#: src/tar.c:676 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:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "CHUỖI" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1879,88 +1911,88 @@ msgstr "" "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:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "Chuyển dạng tên tập tin:" -#: src/tar.c:676 +#: src/tar.c:685 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" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "BIỂU THỨC" -#: src/tar.c:679 +#: src/tar.c:688 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" -#: src/tar.c:684 +#: src/tar.c:694 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:687 +#: src/tar.c:697 msgid "ignore case" msgstr "không phân biệt chữ hoa/thường" -#: src/tar.c:689 +#: src/tar.c:699 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:691 +#: src/tar.c:701 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ừ)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" msgstr "khớp có phân biệt chữ hoa/ thường (mặc định)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "dùng ký tá»± đại diện (mặc định để loại trừ)" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "khớp chuỗi nghÄ©a chữ" -#: src/tar.c:699 +#: src/tar.c:709 msgid "wildcards do not match `/'" msgstr "ký tá»± đại diện không tÆ°Æ¡ng ứng '/'" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" msgstr "ký tá»± đại diện tÆ°Æ¡ng ứng '/' (mặc định để loại trừ)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "Dữ liệu kết quả có tính thông tin:" -#: src/tar.c:709 +#: src/tar.c:719 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" -#: src/tar.c:711 +#: src/tar.c:721 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)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "HÀNH_ĐỘNG" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "thá»±c hiện HÀNH_ĐỘNG này ở mỗi điểm kiểm" -#: src/tar.c:717 +#: src/tar.c:727 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:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "TÍN HIỆU" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1973,27 +2005,27 @@ msgstr "" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1, SIGUSR2;\n" "cÅ©ng chấp nhận tên không có tiền tố « SIG »." -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "in ra ngày sá»­a đổi tập tin theo UTC" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "gá»­i kết quả chi tiết tới TẬP TIN" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "hiên thị số thứ tá»± khối trong lÆ°u trữ với mỗi thông báo" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "hỏi xác nhận trước mỗi hành động" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" msgstr "hiển thị các giá trị mặc định của tar" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2001,32 +2033,32 @@ 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í " "tìm kiếm" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "hiển thị các tên tập tin hay kho lÆ°u trữ sau khi chuyển dạng" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "KIỂU DÁNG" -#: src/tar.c:741 +#: src/tar.c:751 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:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "cÅ©ng trích dẫn các ký tá»± của CHUỖI" -#: src/tar.c:745 +#: src/tar.c:755 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:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "Tùy chọn tÆ°Æ¡ng thích:" -#: src/tar.c:753 +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2034,56 +2066,56 @@ msgstr "" "khi tạo, giống nhÆ° « --old-archive »\n" "khi giải phóng, giống nhÆ° « --no-same-owner »" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "Những tùy chọn khác:" -#: src/tar.c:761 +#: src/tar.c:771 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:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Không nên chỉ ra hai tùy chọn hoặc nhiều hÆ¡n trong số `-Acdtrux'" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "Mâu thuẫn giữa các tùy chọn nén" -#: src/tar.c:965 +#: src/tar.c:985 #, c-format msgid "Unknown signal name: %s" msgstr "Không rõ tên tín hiệu : %s" -#: src/tar.c:989 +#: src/tar.c:1009 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:997 +#: src/tar.c:1017 #, 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:1022 +#: src/tar.c:1042 #, 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" -#: src/tar.c:1096 +#: src/tar.c:1119 #, c-format msgid "%s: file list already read" msgstr "%s: danh sách tập tin đã được đọc" -#: src/tar.c:1159 +#: src/tar.c:1184 #, 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/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "Các đối số thích hợp với tùy chọn « --quoting-style »:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2091,150 +2123,164 @@ msgstr "" "\n" "tar *này* mặc định tới:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "Nhân tố khối không đúng" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "Cảnh báo: không hỗ trợ tùy chọn -I, có thể bạn muốn -j hay -T?" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "Chiều dài băng ghi âm không đúng" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "Có nhiều ngày bắt đầu" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "Giá trị phiên bản sparse không hợp lệ" -#: src/tar.c:1552 +#: src/tar.c:1585 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" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "giá trị « --checkpoint » không phải số nguyên" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s: Nhóm không đúng" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "Đưa ra chế độ không đúng trên tùy chọn" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "Số không đúng" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "Chủ sở hữu không đúng" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "Kích thước bản ghi không đúng" -#: src/tar.c:1797 +#: src/tar.c:1836 #, 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:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "Số thứ tá»± của nguyên tố không đúng" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "Cho phép chỉ một tùy chọn « --to-command »" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" msgstr "Tham số mật độ dạng sai: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" msgstr "Mật độ không rõ : « %c »" -#: src/tar.c:1973 +#: src/tar.c:2012 #, 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]'" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[TẬP TIN]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "Tùy chọn cÅ© `%c' yêu cầu một tham số." -#: src/tar.c:2196 +#: src/tar.c:2235 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" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence không được sá»­ dụng trong chế độ thao tác đã yêu cầu" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "Tập tin nhiều lÆ°u trữ yêu cầu tùy chọn `-M'" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "Không thể kết hợp --listed-incremental với --newer" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "Không thể kiểm tra lÆ°u trữ nhiều khối" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "Không thể kiểm tra lÆ°u trữ đã nén" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "Không thể sá»­ dụng lÆ°u trữ nhiều khối đã nén" -#: src/tar.c:2281 +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" msgstr "Không thể ghép nối các kho nén" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option chỉ dùng được trên lÆ°u trữ POSIX" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "Từ chối tạo một lÆ°u trữ trống rỗng" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Các tùy chọn `-Aru' không tÆ°Æ¡ng thích với `-f -'" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "Bạn phải chỉ ra một trong các tùy chọn `-Acdtrux'" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "Lỗi thoát chậm trễ do lỗi trước" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2242,80 +2288,80 @@ 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:158 +#: src/xheader.c:156 #, 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:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "Không thể dùng mẫu (pattern) %s" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Không thể ghi chèn lên từ khóa %s" -#: src/xheader.c:498 +#: src/xheader.c:496 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:506 +#: src/xheader.c:504 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" -#: src/xheader.c:513 +#: src/xheader.c:511 #, 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:525 +#: src/xheader.c:523 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:533 +#: src/xheader.c:531 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:539 +#: src/xheader.c:537 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:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "Bỏ qua từ khoá phần đầu mở rộng không rõ « %s »" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, 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)" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, 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:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, 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:1328 +#: src/xheader.c:1326 #, 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" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, 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ẻ" @@ -2492,98 +2538,115 @@ msgstr "Số nằm ngoài phạm vi cho phép: %s" msgid "Negative size: %s" msgstr "Kích cỡ âm: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) bị lỗi" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "Lỗi phân tích số gần « %s »" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, c-format msgid "Unknown date format" msgstr "Không rõ định dạng ngày tháng" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "[ĐỐI SỐ...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "không thể mở « %s »" -#: tests/genfile.c:427 +#: tests/genfile.c:425 msgid "cannot seek" msgstr "không thể tìm nÆ¡i" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "tên tập tin chứa ký tá»± vô giá trị" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, 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 »" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "mặt nạ không đúng (gần « %s »)" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, c-format msgid "Unknown field `%s'" msgstr "Không rõ trường « %s »" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" msgstr "không thể đặt thời gian trên « %s »" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "Lệnh đã thoát thành công\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" msgstr "Lệnh bị lỗi với trạng thái %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "Lệnh đã chấm dứt khi nhận tín hiệu %d\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "Lệnh đã dừng chạy khi nhận tín hiệu %d\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "Lệnh đã đổ lõi\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "Lệnh đã chấm dứt\n" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, c-format msgid "--stat requires file names" msgstr "--stat yêu cầu tên tập tin" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "quá nhiều đối số" + +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "hủy hiệu ứng của tùy chọn « --delay-directory-restore »" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "Lỗi thoát chậm trễ do lỗi trước" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 50fa80286ca0e882fc55df4cc9ed7d713b65a2a6..e8bbcd0e2840976bbd25414091cc0cb4fedb96e3 100644 GIT binary patch literal 50429 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 LMwsnFQS|=>(+EXI delta 5153 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 diff --git a/po/zh_CN.po b/po/zh_CN.po index f01e866..aa3cd56 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,16 +1,19 @@ -# Chinese (simplified) translation of tar. -# Copyright (C) 2004 Free Software Foundation, Inc. +# Chinese (simplified) translation for tar. +# Copyright (C) 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the tar package. # Wang Li , 2002. # Rongjun Mu , 2004. +# Ji ZhengYu , 2008. # msgid "" msgstr "" -"Project-Id-Version: tar 1.14\n" +"Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" -"PO-Revision-Date: 2004-08-06 23:45+0800\n" -"Last-Translator: Wang Li \n" -"Language-Team: Chinese (simplified) \n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"PO-Revision-Date: 2008-06-25 12:53中国标准时间\n" +"Last-Translator: Ji ZhengYu \n" +"Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" @@ -24,7 +27,7 @@ msgstr "%2$s 的参数 %1$s 无效" #: lib/argmatch.c:134 #, c-format msgid "ambiguous argument %s for %s" -msgstr "%2$s 的参数 %1$s 具有二义性" +msgstr "%2$s 的参数 %1$s 具有歧义" #: lib/argmatch.c:153 #, c-format @@ -34,113 +37,111 @@ msgstr "有效的参数为：" #: lib/argp-help.c:147 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -msgstr "" +msgstr "ARGP_HELP_FMT: %s 的值小于或者等于 %s" #: lib/argp-help.c:220 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" -msgstr "" +msgstr "%.*s: ARGP_HELP_FMT 参数需要一个值" #: lib/argp-help.c:226 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter must be positive" -msgstr "" +msgstr "%.*s: ARGP_HELP_FMT 参数值必须为正" #: lib/argp-help.c:235 #, c-format msgid "%.*s: Unknown ARGP_HELP_FMT parameter" -msgstr "" +msgstr "%.*s: 未知的 ARGP_HELP_FMT 参数" #: lib/argp-help.c:247 #, c-format msgid "Garbage in ARGP_HELP_FMT: %s" -msgstr "" +msgstr "ARGP_HELP_FMT 中的参数错误: %s" #: lib/argp-help.c:1246 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." -msgstr "" +msgstr "长选项和相应短选项具有相同的强制参数或可选参数。" #: lib/argp-help.c:1639 msgid "Usage:" -msgstr "" +msgstr "用法:" #: lib/argp-help.c:1643 msgid " or: " -msgstr "" +msgstr " 或: " #: lib/argp-help.c:1655 msgid " [OPTION...]" -msgstr "" +msgstr " [选项...]" #: lib/argp-help.c:1682 -#, fuzzy, c-format +#, c-format msgid "Try `%s --help' or `%s --usage' for more information.\n" -msgstr "请用“%s --help”获得更多信息。\n" +msgstr "请用“%s --help”或“%s --usage”获得更多信息。\n" -#: lib/argp-help.c:1710 src/tar.c:1230 -#, fuzzy, c-format +#: lib/argp-help.c:1710 src/tar.c:1255 +#, c-format msgid "Report bugs to %s.\n" -msgstr "" -"\n" -"将错误报告到 <%s>。\n" +msgstr "将错误报告发送到 %s。\n" #: lib/argp-help.c:1929 lib/error.c:125 msgid "Unknown system error" msgstr "未知的系统错误" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 msgid "give this help list" -msgstr "" +msgstr "显示此帮助列表" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 msgid "give a short usage message" -msgstr "" +msgstr "显示简短的用法说明" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" -msgstr "" +msgstr "名称" #: lib/argp-parse.c:83 msgid "set the program name" -msgstr "" +msgstr "设置程序名" #: lib/argp-parse.c:84 msgid "SECS" -msgstr "" +msgstr "秒" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" -msgstr "" +msgstr "挂起 SECS 秒(默认 3600)" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 msgid "print program version" -msgstr "" +msgstr "打印程序版本" #: lib/argp-parse.c:158 #, c-format msgid "(PROGRAM ERROR) No version known!?" -msgstr "" +msgstr "(程序错误)未知版本！？" #: lib/argp-parse.c:611 -#, fuzzy, c-format +#, c-format msgid "%s: Too many arguments\n" -msgstr "%s：选项“%s”需要一个参数\n" +msgstr "%s：参数太多\n" #: lib/argp-parse.c:754 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "" +msgstr "(程序错误)选项可否被识别！？" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" -msgstr "" +msgstr "写错误" #: lib/getopt.c:526 lib/getopt.c:542 #, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "%s：选项“%s”具有二义性\n" +msgstr "%s：选项“%s”具有歧义\n" #: lib/getopt.c:575 lib/getopt.c:579 #, c-format @@ -185,26 +186,26 @@ msgstr "%s：选项需要一个参数 -- %c\n" #: lib/getopt.c:892 lib/getopt.c:908 #, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s：选项“-W %s”具有二义性\n" +msgstr "%s：选项“-W %s”具有歧义\n" #: lib/getopt.c:932 lib/getopt.c:950 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s：选项“-W %s”不接受参数\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "内存耗尽" -#: lib/openat-die.c:33 -#, fuzzy, c-format +#: lib/openat-die.c:35 +#, c-format msgid "unable to record current working directory" -msgstr "无法改变工作目录" +msgstr "无法记录当前工作目录" -#: lib/openat-die.c:46 -#, fuzzy, c-format +#: lib/openat-die.c:48 +#, c-format msgid "failed to return to initial working directory" -msgstr "无法保存工作目录" +msgstr "无法回到起始的工作目录" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because @@ -240,16 +241,16 @@ msgid "%s: Cannot hard link to %s" msgstr "%s：无法硬连接到 %s" #: lib/paxerror.c:179 lib/paxerror.c:211 -#, fuzzy, c-format +#, 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[0] "%1$s：读入 %3$lu 字节时，在 %2$s 字节处发生读错误" #: lib/paxerror.c:192 -#, fuzzy, c-format +#, 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[0] "%1$s：警告：读入 %3$lu 字节时，在 %2$s 字节处发生读错误" #: lib/paxerror.c:259 #, c-format @@ -317,13 +318,25 @@ msgstr "“" msgid "'" msgstr "”" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" -msgstr "" - -#: lib/rpmatch.c:72 +msgstr "^[yY]" + +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" -msgstr "" +msgstr "^[nN]" #: lib/rtapelib.c:299 #, c-format @@ -350,7 +363,7 @@ msgstr "无法执行远程 shell" #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:65 msgid "(C)" -msgstr "" +msgstr "(C)" #: lib/version-etc.c:67 msgid "" @@ -361,24 +374,30 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"License GPLv3+: GNU GPL version 3 or later \n" +"这是自由软件：您可以自由地更改并重新发布它。\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:83 #, c-format msgid "Written by %s.\n" -msgstr "" +msgstr "由 %s 所写。\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:87 #, c-format msgid "Written by %s and %s.\n" -msgstr "" +msgstr "由 %s 和 %s 所写。\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:91 #, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "" +msgstr "由 %s，%s， 和 %s 所写。\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -389,6 +408,8 @@ 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 @@ -399,6 +420,8 @@ 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 @@ -409,6 +432,8 @@ 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 @@ -419,6 +444,8 @@ 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 @@ -430,6 +457,9 @@ msgid "" "%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 @@ -441,6 +471,9 @@ msgid "" "%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 @@ -452,14 +485,17 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"由 %s，%s，%s，\n" +"%s，%s，%s，%s，\n" +"%s，%s，和其他人所写。\n" #: rmt/rmt.c:142 msgid "Input string too long" -msgstr "" +msgstr "输入字符串太长了" #: rmt/rmt.c:161 msgid "Number syntax error" -msgstr "" +msgstr "编号语法错误" #: rmt/rmt.c:180 msgid "rmtd: Cannot allocate buffer space\n" @@ -475,7 +511,7 @@ msgid "Try `%s --help' for more information.\n" msgstr "请用“%s --help”获得更多信息。\n" #: rmt/rmt.c:308 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTION]\n" "Manipulate a tape drive, accepting commands from a remote process.\n" @@ -487,7 +523,7 @@ msgstr "" "操作磁带驱动器，接受来自远程进程的命令。\n" "\n" " --version 输出版本信息。\n" -" --help 输出该求助。\n" +" --help 输出此帮助。\n" #: rmt/rmt.c:315 #, c-format @@ -499,9 +535,8 @@ msgstr "" "将错误报告到 <%s>。\n" #: rmt/rmt.c:397 -#, fuzzy msgid "Seek offset error" -msgstr "定位操作的偏移量超出范围" +msgstr "定位偏移量错误" #: rmt/rmt.c:406 rmt/rmt.c:547 rmt/rmt.c:557 msgid "Seek offset out of range" @@ -523,174 +558,178 @@ msgstr "过早的文件结尾" msgid "Garbage command" msgstr "垃圾命令" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "它似乎不像是一个 tar 归档文件" -#: src/buffer.c:333 src/buffer.c:342 -#, fuzzy +#: src/buffer.c:352 src/buffer.c:361 msgid "Total bytes written" -msgstr "总计写入字节数：%s (%s，%s/s)\n" +msgstr "总计写入字节数" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" -msgstr "" +msgstr "总计读取字节数" -#: src/buffer.c:344 -#, fuzzy, c-format +#: src/buffer.c:363 +#, c-format msgid "Total bytes deleted: %s\n" -msgstr "总计写入字节数：%s (%s，%s/s)\n" +msgstr "总计删除字节数：%s\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(管道)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "record_size 的无效值" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "未给出归档文件名" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "无法验证标准输入/标准输出归档文件" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" -msgstr "" +msgstr "归档被压缩。使用 %s 选项" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "无法更新压缩归档文件" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "处于磁带的起点，现在退出" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "错误过多，退出" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "归档中未对齐的块 (%lu 字节)s" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "记录大小 = %lu 块" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "归档中未对齐的块 (%lu 字节)s" + +#: src/buffer.c:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "无法倒回归档文件；如果没有 -i 可能无法读入它" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" -msgstr "" +msgstr "rmtlseek 未停在记录边界处" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s：包含无效的卷编号" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "卷编号溢出" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "为 %2$s 准备卷 #%1$d 并按回车：" -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "需得到用户应答时文件结束" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "警告：归档文件不完整" -#: src/buffer.c:934 -#, fuzzy, c-format +#: src/buffer.c:954 +#, 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 [name] 给下一卷(以及以后的卷)取一个新文件名\n" -" q 终止 tar\n" -" ! 另起一个子 shell\n" -" ? 显示本列表\n" +" n [name]\t给下一卷(及以后的卷)取一个新文件名\n" +" q\t\t终止 tar\n" +" y or newline\t继续操作\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" -msgstr "" +msgstr " ! 衍生出一个子 shell\n" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" -msgstr "" +msgstr " ? 打印此列表\n" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "没有新的卷；退出。\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" -msgstr "" +msgstr "未指定文件名。重试。\n" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" -msgstr "" +msgstr "无效输入。输入 ? 显示帮助。\n" -#: src/buffer.c:1044 -#, fuzzy, c-format +#: src/buffer.c:1064 +#, c-format msgid "%s command failed" -msgstr "“%s”命令失败" +msgstr "%s 命令失败" -#: src/buffer.c:1199 -#, fuzzy, c-format +#: src/buffer.c:1219 +#, c-format msgid "%s is possibly continued on this volume: header contains truncated name" -msgstr "%s 在本卷中不连续" +msgstr "%s 在本卷可能连续: 头部包含截短的名字" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s 在本卷中不连续" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s 的大小错误 (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "此卷次序有误" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "归档未被标记为匹配 %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "卷标 %s 不匹配 %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" -msgstr "" +msgstr "%s: 文件名太长而无法贮存在 GNU 多卷头，已被截短" + +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek 未停在记录边界处" #: src/compare.c:96 #, c-format @@ -702,8 +741,8 @@ msgstr[0] "仅能读入 %2$lu 中的 %1$lu 个字节" msgid "Contents differ" msgstr "内容不同" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "归档文件中异常的 EOF" @@ -750,17 +789,17 @@ msgid "Verify " msgstr "校验" #: src/compare.c:469 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type `%c', diffed as normal file" msgstr "%s：未知的文件类型“%c”，与普通文件不同" #: src/compare.c:524 msgid "Archive contains file names with leading prefixes removed." -msgstr "" +msgstr "归档包含带有被移除前导字符的文件名。" #: src/compare.c:526 msgid "Verification may fail to locate original files." -msgstr "" +msgstr "位于原始文件中的验证可能失败。" #: src/compare.c:596 #, c-format @@ -776,7 +815,7 @@ msgstr "在 %s 处一个单独的零块" #: src/create.c:67 #, c-format msgid "%s: contains a cache directory tag %s; %s" -msgstr "" +msgstr "%s: 包含一个缓存目录标识 %s；%s" #: src/create.c:272 #, c-format @@ -818,9 +857,9 @@ msgstr[0] "%s：文件缩小 %s 字节；用零填充" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s：文件在不同的文件系统上；未输出" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" -msgstr "" +msgstr "未输出内容" #: src/create.c:1361 #, c-format @@ -828,9 +867,9 @@ msgid "%s: Unknown file type; file ignored" msgstr "%s：未知的文件类型；忽略文件" #: src/create.c:1464 -#, fuzzy, c-format +#, c-format msgid "Missing links to %s.\n" -msgstr "缺少到“%s”的连接。\n" +msgstr "缺少到 %s 的连接。\n" #: src/create.c:1535 #, c-format @@ -847,9 +886,9 @@ msgstr "%s：文件是归档文件；未输出" msgid "%s: File removed before we read it" msgstr "%s：文件在我们读入之前被删除了" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 msgid "directory not dumped" -msgstr "" +msgstr "未输出目录" #: src/create.c:1659 #, c-format @@ -864,7 +903,7 @@ msgstr "%s：忽略套接字(socket)" #: src/create.c:1744 #, c-format msgid "%s: door ignored" -msgstr "" +msgstr "%s: 忽略权限" #: src/delete.c:216 src/list.c:181 src/update.c:170 msgid "Skipping to next header" @@ -880,9 +919,9 @@ msgid "%s: implausibly old time stamp %s" msgstr "%s：不可信的旧时间戳 %s" #: src/extract.c:215 -#, fuzzy, c-format +#, c-format msgid "%s: time stamp %s is %s s in the future" -msgstr "%s：时间戳 %s 是将来的 %lu 秒之后" +msgstr "%s：时间戳 %s 是未来的 %s 秒之后" #: src/extract.c:395 #, c-format @@ -898,168 +937,166 @@ msgstr "%s：目录名在状态信息被获取之前改变了" msgid "Extracting contiguous files as regular files" msgstr "展开紧邻的文件为普通文件" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "正试图将符号连接展开为硬连接" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "正在读入 %s\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s：无法展开 -- 文件一直持续到另一卷中" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" -msgstr "转换的文件名中有异常的 EOF" +msgstr "异常的长名字头部" -#: src/extract.c:1159 -#, fuzzy, c-format +#: src/extract.c:1156 +#, c-format msgid "%s: Unknown file type `%c', extracted as normal file" -msgstr "%s：未知的文件类型“%c”，作为普通文件进行展开" +msgstr "%s：未知的文件类型“%c”，作为普通文件展开" -#: src/extract.c:1184 -#, fuzzy, c-format +#: src/extract.c:1181 +#, c-format msgid "Current %s is newer or same age" -msgstr "当前的“%s”更新" +msgstr "当前的“%s”更新或一样新" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s：无法备份该文件" -#: src/extract.c:1358 -#, fuzzy, c-format +#: src/extract.c:1355 +#, c-format msgid "Cannot rename %s to %s" -msgstr "%s：无法重命名为 %s" +msgstr "无法将 %s 重命名为 %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "错误不可恢复：现在退出" -#: src/incremen.c:390 src/incremen.c:430 -#, fuzzy, c-format +#: src/incremen.c:445 src/incremen.c:489 +#, c-format msgid "%s: Directory has been renamed from %s" -msgstr "%s：目录已被改名" +msgstr "%s：目录已改名，不再是 %s" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s：目录已被改名" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s：目录是新的" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "无效的时间戳" -#: src/incremen.c:889 -#, fuzzy +#: src/incremen.c:949 msgid "Invalid modification time (seconds)" -msgstr "选项中给出无效的访问模式" +msgstr "无效的修改时间(秒)" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" -msgstr "" +msgstr "无效的修改时间(纳秒)" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "无效的设备号" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "无效的 inode 号" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" -msgstr "" +msgstr "读取目录文件时字段太长" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" -msgstr "" +msgstr "目录文件读取错误" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 -#, fuzzy +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 msgid "Unexpected EOF in snapshot file" -msgstr "归档文件中异常的 EOF" +msgstr "目录文件中异常的文件结尾(EOF)" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" -msgstr "" +msgstr "目录文件中异常的字段值" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" -msgstr "" +msgstr "缺少记录终止符" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" -msgstr "" +msgstr "文件格式错误增量" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" -msgstr "" +msgstr "不支持增量格式版本: %" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" -msgstr "" +msgstr "错误的 dumpdir: 需要“%c”但实际为 %#3o" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" -msgstr "" +msgstr "错误的 dumpdir: 重复的“X”" -#: src/incremen.c:1392 +#: src/incremen.c:1452 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "" +msgstr "错误的 dumpdir: “R”中有空名字" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" -msgstr "" +msgstr "错误的 dumpdir: “R”后未紧接着用“T”" -#: src/incremen.c:1411 +#: src/incremen.c:1471 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "" +msgstr "错误的 dumpdir: “T”中有空名字" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" -msgstr "" +msgstr "错误的 dumpdir: 需要“%c”但实际为数据结尾" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" -msgstr "" +msgstr "错误的 dumpdir: 从未用过“X”" -#: src/incremen.c:1481 -#, fuzzy, c-format +#: src/incremen.c:1541 +#, c-format msgid "Cannot create temporary directory using template %s" -msgstr "无法为块因子(blocking factor) %d 分配内存" +msgstr "无法通过模板 %s 创建临时目录" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1556 -#, fuzzy, c-format +#: src/incremen.c:1616 +#, c-format msgid "%s: directory is on a different device: not purging" -msgstr "%s：文件在不同的文件系统上；未输出" +msgstr "%s: 目录在不同的设备上: 未清除" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在删除 %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s：无法删除" @@ -1079,86 +1116,86 @@ msgstr "块 %s：** 空块 **\n" msgid "block %s: ** End of File **\n" msgstr "块 %s：** 文件结束 **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "块 %s：" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" -msgstr "归档的八进制值 %.*s 超出范围 %s；假定为其二进制补" +msgstr "归档的八进制值 %.*s 超出范围 %s；假定为其二进制补码" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "归档八进制值 %.*s 超出 %s 的范围" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "归档包含过时的 base-64 头" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "归档签署的 base-64 字符串 %s 超出范围 %s" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, c-format msgid "Archive contains %.*s where numeric %s value expected" -msgstr "" +msgstr "归档包含 %.*s 而需要数字值 %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:845 -#, fuzzy, c-format +#: src/list.c:854 +#, c-format msgid "Archive value %s is out of %s range %s..%s" -msgstr "归档值 %s 超出 %s 的范围 %s.%s" +msgstr "归档值 %s 超出 %s 的范围 %s..%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " 连接到 %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr " 未知的文件类型 %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--长连接--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--长名--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--卷头--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "--从 %s 字节继续--\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "正在创建目录：" @@ -1195,24 +1232,24 @@ msgstr "进程内通道" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," -msgstr "" +msgstr "请在文件名中使用匹配字符模式。" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" -msgstr "" +msgstr "使用 --wildcards 打开模式匹配，或是 --no-wildcards 来关闭之" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." -msgstr "" +msgstr "不显示此警告。" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s：归档中找不到" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s：没有在归档中找到需要的" @@ -1235,10 +1272,9 @@ msgstr "在不兼容的归档格式上需要 GNU 特征" #, c-format msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." -msgstr "" +msgstr "未知的引用形式‘%s’。尝试用‘%s --quoting-style=help’获取列表。" -#: src/tar.c:334 -#, fuzzy +#: src/tar.c:336 msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1248,17 +1284,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’ 将许多文件一起保存至一个单独的磁带或磁盘归档，并能从归档中单独还原" +"所需文件。\n" "\n" -"用法：%s [选项]... [文件]...\n" -"\n" -"示例：\n" -" %s -cf archive.tar foo bar # 从文件 foo 和 bar 创建归档文件 archive." +"示例\n" +" tar -cf archive.tar foo bar # 从文件 foo 和 bar 创建归档文件 archive." "tar。\n" -" %s -tvf archive.tar # 详细列举归档文件 archive.tar 中的所有文件。\n" -" %s -xf archive.tar # 展开归档文件 archive.tar 中的所有文件。\n" +" tar -tvf archive.tar # 详细列举归档文件 archive.tar 中的所有文" +"件。\n" +" tar -xf archive.tar # 展开归档文件 archive.tar 中的所有文件。\n" -#: src/tar.c:343 -#, fuzzy +#: src/tar.c:345 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 " @@ -1269,924 +1305,947 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"\n" "除非以 --suffix 或 SIMPLE_BACKUP_SUFFIX 设置备份后缀，否则备份后缀就是“~”。\n" "可以用 --backup 或 VERSION_CONTROL 设置版本控制，可能的值为：\n" "\n" +" none, off\t 从不做备份\n" " t, numbered 进行编号备份\n" " nil, existing 如果编号备份存在则进行编号备份，否则进行简单备份\n" " never, simple 总是使用简单备份\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" -msgstr "" +msgstr "主操作模式:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" -msgstr "" +msgstr "列出归档内容" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" -msgstr "" +msgstr "从归档中解出文件" -#: src/tar.c:377 -#, fuzzy +#: src/tar.c:379 msgid "create a new archive" -msgstr "归档文件中异常的 EOF" +msgstr "创建一个新归档" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" -msgstr "" +msgstr "找出归档和文件系统的差异" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" -msgstr "" +msgstr "追加文件至归档结尾" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" -msgstr "" +msgstr "仅追加比归档中副本更新的文件" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" -msgstr "" +msgstr "追加 tar 文件至归档" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" -msgstr "" +msgstr "从归档(非磁带！)中删除" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" -msgstr "" +msgstr "测试归档卷标并退出" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" -msgstr "" +msgstr "操作修饰符:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" -msgstr "" +msgstr "高效处理离散文件" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" -msgstr "" +msgstr "MAJOR[.MINOR]" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" -msgstr "" +msgstr "设置所用的离散格式版本(隐含 --sparse)" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" -msgstr "" +msgstr "处理老式的 GNU 格式的增量备份" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" -msgstr "" +msgstr "文件" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" -msgstr "" +msgstr "处理新式的 GNU 格式的增量备份" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" -msgstr "" +msgstr "当遇上不可读文件时不要以非零值退出" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" -msgstr "" +msgstr "NUMBER" -#: src/tar.c:409 +#: src/tar.c:411 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 "" +"仅处理归档中每个文件的第 NUMBER 个事件；仅当与以下子命令 --delete, --diff, --" +"extract 或是 --list 中的一个联合使用时，此选项才有效。而且不管文件列表是以命" +"令行形式给出或是通过 -T 选项指定的；NUMBER 值默认为 1" -#: src/tar.c:415 +#: src/tar.c:417 msgid "archive is seekable" -msgstr "" +msgstr "归档可检索" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "当创建增量归档时不要检查设备号" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" -msgstr "" +msgstr "当创建增量归档时检查设备号(默认)" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" -msgstr "" +msgstr "重写控制:" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" -msgstr "" +msgstr "在写入以后尝试校验归档" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" -msgstr "" +msgstr "在添加文件至归档后删除它们" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" -msgstr "" +msgstr "解压时不要替换存在的文件" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" -msgstr "" +msgstr "不要替换比归档中副本更新的已存在的文件" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" -msgstr "" +msgstr "解压时重写存在的文件" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" -msgstr "" +msgstr "在解压要重写的文件之前先删除它们" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" -msgstr "" +msgstr "解压目录之前先清除目录层次" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" -msgstr "" +msgstr "保留已存在目录的元数据" -#: src/tar.c:445 +#: src/tar.c:447 msgid "overwrite metadata of existing directories when extracting (default)" -msgstr "" +msgstr "解压时重写已存在目录的元数据(默认)" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" -msgstr "" +msgstr "选择输出流:" -#: src/tar.c:454 -#, fuzzy +#: src/tar.c:456 msgid "extract files to standard output" -msgstr "写入标准输出时出错" +msgstr "解压文件至标准输出" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" -msgstr "" +msgstr "COMMAND" -#: src/tar.c:456 +#: src/tar.c:458 msgid "pipe extracted files to another program" -msgstr "" +msgstr "将解压的文件通过管道传送至另一个程序" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" -msgstr "" +msgstr "忽略子进程的退出代码" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" -msgstr "" +msgstr "将子进程的非零退出代码认为发生错误" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" -msgstr "" +msgstr "操作文件属性:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" -msgstr "" +msgstr "强制将 NAME 作为所添加的文件的所有者" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" -msgstr "" +msgstr "强制将 NAME 作为所添加的文件的组所有者" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" -msgstr "" +msgstr "DATE-OR-FILE" -#: src/tar.c:472 +#: src/tar.c:474 msgid "set mtime for added files from DATE-OR-FILE" -msgstr "" +msgstr "从 DATE-OR-FILE 中为添加的文件设置 mtime" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" -msgstr "" +msgstr "CHANGES" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" -msgstr "" +msgstr "强制将所添加的文件(符号)更改为权限 CHANGES" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" -msgstr "" +msgstr "METHOD" -#: src/tar.c:477 +#: src/tar.c:479 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 "" +"在输出的文件上保留访问时间，要么通过在读取(默认 METHOD=‘replace’)后还原时间，" +"要不就不要在第一次(METHOD=‘system’)设置时间" -#: src/tar.c:481 +#: src/tar.c:483 msgid "don't extract file modified time" -msgstr "" +msgstr "不要解压文件的修改时间" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" -msgstr "" +msgstr "尝试解压时保持所有者关系一致" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" -msgstr "" +msgstr "将文件解压为您所有" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" -msgstr "" +msgstr "总是以数字代表用户/组的名称" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" -msgstr "" +msgstr "解压文件权限信息(默认只为超级用户服务)" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" -msgstr "" +msgstr "从归档中解压权限时使用用户的掩码位(默认为普通用户服务)" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" -msgstr "" +msgstr "为解压至匹配归档排序名称" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" -msgstr "" +msgstr "与 -p 和 -s 一样" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" -msgstr "" +msgstr "直到解压结束才设置修改时间和所解目录的权限" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" -msgstr "" +msgstr "取消 --delay-directory-restore 选项的效果" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" -msgstr "" +msgstr "设备选择和切换:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" -msgstr "" +msgstr "ARCHIVE" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" -msgstr "" +msgstr "使用归档文件或 ARCHIVE 设备" -#: src/tar.c:513 +#: src/tar.c:515 msgid "archive file is local even if it has a colon" -msgstr "" +msgstr "即使归档文件存在副本还是把它认为是本地归档" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" -msgstr "" +msgstr "使用指定的 rmt COMMAND 代替 rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" -msgstr "" +msgstr "使用远程 COMMAND 代替 rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" -msgstr "" +msgstr "指定驱动器和压缩率" -#: src/tar.c:535 -#, fuzzy +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" -msgstr "无法检验多卷归档文件" +msgstr "创建/列出/解压多卷归档文件" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" -msgstr "" +msgstr "写入 NUMBER × 1024 字节后更换磁带" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" -msgstr "" +msgstr "在每卷磁带最后运行脚本(隐含 -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" -msgstr "" +msgstr "使用/更新 FILE 中的卷数" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" -msgstr "" +msgstr "设备分块:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" -msgstr "" +msgstr "BLOCKS" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" -msgstr "" +msgstr "每个记录 BLOCKS x 512 字节" -#: src/tar.c:552 +#: src/tar.c:554 msgid "NUMBER of bytes per record, multiple of 512" -msgstr "" +msgstr "每个记录的字节数 NUMBER，乘以 512" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" -msgstr "" +msgstr "忽略归档中的零字节块(即文件结尾)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" -msgstr "" +msgstr "读取时重新分块(只对 4.2BSD 管道有效)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" -msgstr "" +msgstr "选择归档格式:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" -msgstr "" +msgstr "FORMAT" -#: src/tar.c:564 +#: src/tar.c:566 msgid "create archive of the given format" -msgstr "" +msgstr "创建指定格式的归档" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" -msgstr "" +msgstr "FORMAT 是以下格式中的一种:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" -msgstr "" +msgstr "old V7 tar 格式" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" -msgstr "" +msgstr "GNU 格式 as per tar <= 1.12" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" -msgstr "" +msgstr "GNU tar 1.13.x 格式" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" -msgstr "" +msgstr "POSIX 1003.1-1988 (ustar) 格式" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" -msgstr "" +msgstr "POSIX 1003.1-2001 (pax) 格式" -#: src/tar.c:577 +#: src/tar.c:579 msgid "same as pax" -msgstr "" +msgstr "等同于 pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" -msgstr "" +msgstr "等同于 --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" -msgstr "" +msgstr "等同于 --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 msgid "keyword[[:]=value][,keyword[[:]=value]]..." -msgstr "" +msgstr "关键字[[:]=值][,关键字[[:]=值]]..." -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" -msgstr "" +msgstr "控制 pax 关键字" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" -msgstr "" +msgstr "TEXT" -#: src/tar.c:587 +#: src/tar.c:589 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" -msgstr "" - -#: src/tar.c:592 -#, fuzzy -msgid "Compression options:" -msgstr "冲突的压缩选项" +msgstr "创建带有卷名 TEXT 的归档；在列出/解压时，使用 TEXT 作为卷名的模式串" #: src/tar.c:594 -msgid "use archive suffix to determine the compression program" -msgstr "" +msgid "Compression options:" +msgstr "压缩选项:" #: src/tar.c:596 -msgid "filter the archive through bzip2" -msgstr "" +msgid "use archive suffix to determine the compression program" +msgstr "使用归档后缀来决定压缩程序" #: src/tar.c:598 #, fuzzy +msgid "do not use use archive suffix to determine the compression program" +msgstr "使用归档后缀来决定压缩程序" + +#: src/tar.c:601 +msgid "filter the archive through bzip2" +msgstr "通过 bzip2 过滤归档" + +#: src/tar.c:603 msgid "filter the archive through gzip" -msgstr "%s：文件是归档文件；未输出" +msgstr "通过 gzip 过滤归档" -#: src/tar.c:602 -#, fuzzy +#: src/tar.c:607 msgid "filter the archive through compress" -msgstr "%s：文件是归档文件；未输出" +msgstr "通过 compress 过滤归档" -#: src/tar.c:605 -#, fuzzy +#: src/tar.c:610 msgid "filter the archive through lzma" -msgstr "%s：文件是归档文件；未输出" +msgstr "通过 lzma 过滤归档" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "通过 gzip 过滤归档" + +#: src/tar.c:613 msgid "PROG" -msgstr "" +msgstr "PROG" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" -msgstr "" +msgstr "通过 PROG 过滤(必须是能接受 -d 选项的程序)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" -msgstr "" +msgstr "本地文件选择:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" -msgstr "" +msgstr "添加指定的 FILE 至归档(如果名字以 - 开始会很有用的)" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" -msgstr "" +msgstr "DIR" -#: src/tar.c:617 -#, fuzzy +#: src/tar.c:624 msgid "change to directory DIR" -msgstr "无法改变工作目录" +msgstr "改变至目录 DIR" -#: src/tar.c:619 +#: src/tar.c:626 msgid "get names to extract or create from FILE" -msgstr "" +msgstr "从 FILE 中获取文件名来解压或创建文件" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" +msgstr "-T 读取以空终止的名字，禁用 -C" + +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:623 +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" -msgstr "" +msgstr "结束以 -T 读取的文件名(默认)" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" -msgstr "" +msgstr "不要结束以 -T 读取的文件名" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" -msgstr "" +msgstr "PATTERN" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" -msgstr "" +msgstr "排除以 PATTERN 指定的文件" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" -msgstr "" +msgstr "排除 FILE 中列出的模式串" -#: src/tar.c:631 +#: src/tar.c:640 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" -msgstr "" +msgstr "除标识文件本身外，排除包含 CACHEDIR.TAG 的目录中的内容" -#: src/tar.c:634 +#: src/tar.c:643 msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "" +msgstr "排除包含 CACHEDIR.TAG 的目录中所有内容" -#: src/tar.c:637 +#: src/tar.c:646 msgid "exclude directories containing CACHEDIR.TAG" -msgstr "" +msgstr "排除包含 CACHEDIR.TAG 的目录" -#: src/tar.c:639 +#: src/tar.c:648 msgid "exclude contents of directories containing FILE, except for FILE itself" -msgstr "" +msgstr "除 FILE 自身外，排除包含 FILE 的目录中的内容" -#: src/tar.c:642 +#: src/tar.c:651 msgid "exclude everything under directories containing FILE" -msgstr "" +msgstr "排除包含 FILE 的目录中的所有内容" -#: src/tar.c:644 +#: src/tar.c:653 msgid "exclude directories containing FILE" -msgstr "" +msgstr "排除包含 FILE 的目录" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" -msgstr "" +msgstr "排除版本控制系统目录" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" -msgstr "" +msgstr "避免目录中的自动降级" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" -msgstr "" +msgstr "创建归档时保存在本地文件系统中" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" -msgstr "" +msgstr "目录递归(默认)" -#: src/tar.c:654 -#, fuzzy +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" -msgstr "从成员名中删除开头的“%s”" +msgstr "不要从文件名中清除引导符‘/’" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" -msgstr "" +msgstr "跟踪符号链接；将它们所指向的文件归档并输出" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" -msgstr "" +msgstr "跟踪硬链接；将它们所指向的文件归档并输出" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" -msgstr "" +msgstr "MEMBER-NAME" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" -msgstr "" +msgstr "从归档中的 MEMBER-NAME 成员处开始" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" -msgstr "" +msgstr "只保存比 DATE-OR-FILE 更新的文件" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" -msgstr "" +msgstr "DATE" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" -msgstr "" +msgstr "当只有数据改变时比较数据和时间" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" -msgstr "" +msgstr "CONTROL" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" -msgstr "" +msgstr "在删除前备份，选择 CONTROL 版本" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" -msgstr "" +msgstr "STRING" -#: src/tar.c:669 +#: src/tar.c:678 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" +"在删除前备份，除非被环境变量 SIMPLE_BACKUP_SUFFIX 覆盖，否则覆盖常用后缀(‘’)" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" -msgstr "" +msgstr "文件名变换:" -#: src/tar.c:676 +#: src/tar.c:685 msgid "strip NUMBER leading components from file names on extraction" -msgstr "" +msgstr "解压时从文件名中清除 NUMBER 个引导部分" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" -msgstr "" +msgstr "EXPRESSION" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" -msgstr "" +msgstr "使用 sed 代替 EXPRESSION 来进行文件名变换" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" -msgstr "" +msgstr "文件名匹配选项(同时影响排除和包括模式串):" -#: src/tar.c:687 +#: src/tar.c:697 msgid "ignore case" -msgstr "" +msgstr "忽略大小写" -#: src/tar.c:689 +#: src/tar.c:699 msgid "patterns match file name start" -msgstr "" +msgstr "模式串匹配文件名头部" -#: src/tar.c:691 +#: src/tar.c:701 msgid "patterns match after any `/' (default for exclusion)" -msgstr "" +msgstr "模式串匹配任意‘/’后字符(默认对 exclusion 有效)" -#: src/tar.c:693 +#: src/tar.c:703 msgid "case sensitive matching (default)" -msgstr "" +msgstr "匹配大小写(默认)" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" -msgstr "" +msgstr "使用通配符(默认对 exclusion )" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" -msgstr "" +msgstr "逐字匹配字符串" -#: src/tar.c:699 -#, fuzzy +#: src/tar.c:709 msgid "wildcards do not match `/'" -msgstr "卷标 %s 不匹配 %s" +msgstr "通配符不匹配‘/’" -#: src/tar.c:701 +#: src/tar.c:711 msgid "wildcards match `/' (default for exclusion)" -msgstr "" +msgstr "通配符匹配‘/’(默认对排除操作有效)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" -msgstr "" +msgstr "提示性输出:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" -msgstr "" +msgstr "详细地列出处理的文件" -#: src/tar.c:711 +#: src/tar.c:721 msgid "display progress messages every NUMBERth record (default 10)" -msgstr "" +msgstr "每隔 NUMBER 个记录显示进度信息(默认为 10 个)" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" -msgstr "" +msgstr "ACTION" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" -msgstr "" +msgstr "在每个检查点上执行 ACTION" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" -msgstr "" +msgstr "只要不是所有链接都被输出就打印信息" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" -msgstr "" +msgstr "SIGNAL" -#: src/tar.c:719 +#: src/tar.c:729 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 "" +"处理归档后打印出总字节数；当此 SIGNAL 被触发时带参数 - 打印总字节数；允许的信" +"号为: SIGHUP，SIGQUIT，SIGINT，SIGUSR1 和 SIGUSR2；同时也接受不带 SIG 前缀的" +"信号名称" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" -msgstr "" +msgstr "以 UTC 格式打印文件修改信息" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" -msgstr "" +msgstr "将详细输出发送至 FILE" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" -msgstr "" +msgstr "每个信息都显示归档内的块数" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" -msgstr "" +msgstr "每次操作都要求确认" -#: src/tar.c:733 +#: src/tar.c:743 msgid "show tar defaults" -msgstr "" +msgstr "显示 tar 默认选项" -#: src/tar.c:735 +#: src/tar.c:745 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" -msgstr "" +msgstr "列表或解压时，列出每个不匹配查找标准的目录" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" -msgstr "" +msgstr "显示变换后的文件名或归档名" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" -msgstr "" +msgstr "STYLE" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" -msgstr "" +msgstr "设置名称引用风格；有效的 STYLE 值请参阅以下说明" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" -msgstr "" +msgstr "来自 STRING 的额外的引用字符" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" -msgstr "" +msgstr "禁用来自 STRING 的字符引用" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" -msgstr "" +msgstr "兼容性选项:" -#: src/tar.c:753 -#, fuzzy +#: src/tar.c:763 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" -msgstr "" -"\n" -"兼容性选项：\n" -" -o 创建归档时，相当于 --old-archive\n" -" 展开归档时，相当于 --no-same-owner\n" +msgstr "创建归档时，相当于 --old-archive；展开归档时，相当于 --no-same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" -msgstr "" +msgstr "其它选项:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" -msgstr "" +msgstr "禁用某些潜在的有危险的选项" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" -msgstr "您不能在“-Acdtrux”中指定多个选项" +msgstr "您不能指定除“-Acdtrux”外的选项" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" -msgstr "冲突的压缩选项" +msgstr "压缩选项冲突" -#: src/tar.c:965 -#, fuzzy, c-format +#: src/tar.c:985 +#, c-format msgid "Unknown signal name: %s" -msgstr " 未知的文件类型 %s\n" +msgstr " 未知的信号名称: %s" -#: src/tar.c:989 -#, fuzzy +#: src/tar.c:1009 msgid "Date sample file not found" -msgstr "找不到数据文件" +msgstr "找不到数据样板文件" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "把未知的时间格式 %2$s 替换为 %1$s" -#: src/tar.c:1022 -#, fuzzy, c-format +#: src/tar.c:1042 +#, c-format msgid "Option %s: Treating date `%s' as %s" -msgstr "把时间 `%s' 当作 %s + %ld 纳秒" +msgstr "选项 %s: 将日期 ‘%s’ 当作 %s" -#: src/tar.c:1096 -#, fuzzy, c-format +#: src/tar.c:1119 +#, c-format msgid "%s: file list already read" -msgstr "%s：文件是归档文件；未输出" +msgstr "%s: 文件列表已经读取" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" -msgstr "" +msgstr "%s: 读取的文件名含有空字符" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" -msgstr "" +msgstr "--quoting-style 选项的有效参数为:" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" +"\n" +"æ­¤ tar 默认为:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 #, fuzzy msgid "Invalid blocking factor" msgstr "无效的块因子" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "警告：不支持 -I 选项，或许您的意思是 -j 或者 -T ？" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "无效的磁带长度" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "多于一个时间阈值" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 +#, fuzzy msgid "Invalid sparse version value" -msgstr "" +msgstr "无效的离散版本值" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" -msgstr "" +msgstr "此平台不支持 --atime-preserve=‘system’ " -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" -msgstr "" +msgstr "--checkpoint 值不是个整数" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s：无效的组" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "选项中给出无效的访问模式" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "无效的数字" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "无效的所有者" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "无效的记录大小" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "记录大小必须是 %d 的倍数。" -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "无效的元素数" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" -msgstr "" +msgstr "仅允许使用一个 --to-command 选项" -#: src/tar.c:1930 +#: src/tar.c:1969 #, c-format msgid "Malformed density argument: %s" -msgstr "" +msgstr "错误的压缩参数: %s" -#: src/tar.c:1956 +#: src/tar.c:1995 #, c-format msgid "Unknown density: `%c'" -msgstr "" +msgstr "未知的压缩参数: ‘%c’" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "本 tar 不支持选项“-[0-7][lmh]”" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." -msgstr "" +msgstr "[FILE]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "旧选项“%c”需要参数。" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "没有一个文件列表时 --occurrence 是没有意义的" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence 不能用于请求的操作模式中" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "多个归档文件需要使用“-M”选项" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "无法在使用 --newer 的时候使用 --listed-incremental" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "无法检验多卷归档文件" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "无法检验压缩归档文件" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "无法使用多卷压缩归档文件" -#: src/tar.c:2281 -#, fuzzy +#: src/tar.c:2320 msgid "Cannot concatenate compressed archives" -msgstr "无法更新压缩归档文件" +msgstr "无法联结压缩归档文件" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option 只能用于 POSIX 归档中" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "谨慎地拒绝创建空归档文件" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "选项“-Aru”与“-f -”不兼容" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "您必须从选项“-Acdtrux”中指定一个" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "由于前面延迟的错误而退出" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2194,338 +2253,355 @@ msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s：文件缩小 %s 字节" -#: src/xheader.c:158 -#, fuzzy, c-format +#: src/xheader.c:156 +#, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "关键字 %s 未知或还未实现" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "不能使用模式 %s" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "不能覆盖关键字 %s" -#: src/xheader.c:498 -#, fuzzy +#: src/xheader.c:496 msgid "Malformed extended header: missing length" -msgstr "错误的扩展头：缺少等于符号" +msgstr "错误的扩展头: 缺少 length" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" -msgstr "" +msgstr "扩展头长度超出所允许的范围" -#: src/xheader.c:513 -#, fuzzy, c-format +#: src/xheader.c:511 +#, c-format msgid "Extended header length %*s is out of range" -msgstr "归档签署的 base-64 字符串 %s 超出范围 %s" +msgstr "扩展头长度 %*s 超出范围" -#: src/xheader.c:525 -#, fuzzy +#: src/xheader.c:523 msgid "Malformed extended header: missing blank after length" -msgstr "错误的扩展头：长度后缺少空白符" +msgstr "错误的扩展头: length 后缺少空白符" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" -msgstr "错误的扩展头：缺少等于符号" +msgstr "错误的扩展头: 缺少等于符号" -#: src/xheader.c:539 -#, fuzzy +#: src/xheader.c:537 msgid "Malformed extended header: missing newline" -msgstr "错误的扩展头：缺少等于符号" +msgstr "错误的扩展头: 缺少空行" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" -msgstr "" +msgstr "忽略未知的扩展头关键字‘%s’" -#: src/xheader.c:780 +#: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" -msgstr "" +msgstr "生成的关键字/值对太长了(keyword=%s, length=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:812 -#, fuzzy, c-format +#: src/xheader.c:810 +#, c-format msgid "Extended header %s=%s is out of range %s..%s" -msgstr "归档值 %s 超出 %s 的范围 %s.%s" +msgstr "扩展头 %s=%s 超出范围 %s..%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 -#, fuzzy, c-format +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 +#, c-format msgid "Malformed extended header: invalid %s=%s" -msgstr "错误的扩展头：缺少等于符号" +msgstr "错误的扩展头: %s=%s 无效" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 -#, fuzzy, c-format +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 +#, c-format msgid "Malformed extended header: excess %s=%s" -msgstr "错误的扩展头：缺少等于符号" +msgstr "错误的扩展头: %s=%s 溢出" -#: src/xheader.c:1328 -#, fuzzy, c-format +#: src/xheader.c:1326 +#, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "错误的扩展头：缺少等于符号" +msgstr "错误的扩展头: %s 无效: 非预期的分隔符 %c" -#: src/xheader.c:1338 -#, fuzzy, c-format +#: src/xheader.c:1336 +#, c-format msgid "Malformed extended header: invalid %s: odd number of values" -msgstr "错误的扩展头：缺少等于符号" +msgstr "错误的扩展头: %s 无效: 奇怪的数值" #: src/checkpoint.c:107 -#, fuzzy, c-format +#, c-format msgid "%s: not a valid timeout" -msgstr "%s：无效的组" +msgstr "%s: 无效的超时设置" #: src/checkpoint.c:112 #, c-format msgid "%s: unknown checkpoint action" -msgstr "" +msgstr "%s: 未知的检查点操作" #: src/checkpoint.c:132 msgid "write" -msgstr "" +msgstr "写入" #: src/checkpoint.c:132 msgid "read" -msgstr "" +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:222 -#, fuzzy, c-format +#, c-format msgid "Write checkpoint %u" -msgstr "写入检查点 %d" +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:228 -#, fuzzy, c-format +#, c-format msgid "Read checkpoint %u" -msgstr "读入检查点 %d" +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:126 -#, fuzzy msgid "File creation options:" -msgstr "冲突的压缩选项" +msgstr "文件创建选项:" #: tests/genfile.c:127 tests/genfile.c:138 msgid "SIZE" -msgstr "" +msgstr "SIZE" #: tests/genfile.c:128 msgid "Create file of the given SIZE" -msgstr "" +msgstr "创建指定 SIZE 的文件" #: tests/genfile.c:130 -#, fuzzy msgid "Write to file NAME, instead of standard output" -msgstr "写入标准输出时出错" +msgstr "写入文件 NAME，而不是标准输出" #: tests/genfile.c:132 -#, fuzzy msgid "Read file names from FILE" -msgstr "从 %2$s 读入 %1$s 字节" +msgstr "从 FILE 读取文件名" #: tests/genfile.c:134 msgid "-T reads null-terminated names" -msgstr "" +msgstr "-T 读取以 NULL 终止的名字" #: tests/genfile.c:136 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" -msgstr "" +msgstr "以指定的 PATTERN 填充文件。PATTERN 可以是‘default’或是‘zeros’" #: tests/genfile.c:139 msgid "Size of a block for sparse file" -msgstr "" +msgstr "离散文件的块大小" #: tests/genfile.c:141 +#, fuzzy msgid "Generate sparse file. Rest of the command line gives the file map." -msgstr "" +msgstr "生成离散文件。命令行其余选项指定 map 文件。" #: tests/genfile.c:143 msgid "OFFSET" -msgstr "" +msgstr "OFFSET" #: tests/genfile.c:144 msgid "Seek to the given offset before writing data" -msgstr "" +msgstr "在写入数据前定位至指定的偏移位" #: tests/genfile.c:150 msgid "File statistics options:" -msgstr "" +msgstr "文件统计选项:" #: tests/genfile.c:153 msgid "Print contents of struct stat for each given file. Default FORMAT is: " -msgstr "" +msgstr "打印每个给定文件的 stat 结构定义的内容。默认 FORMAT 是: " #: tests/genfile.c:160 msgid "Synchronous execution options:" -msgstr "" +msgstr "同步执行选项:" #: tests/genfile.c:163 msgid "" "Execute given COMMAND. Useful with --checkpoint and one of --cut, --append, " "--touch" msgstr "" +"执行指定的 COMMAND。与 --checkpoint 或 --cut，--append，--touch 中的一个一起" +"使用时有用" #: tests/genfile.c:166 msgid "Perform given action (see below) upon reaching checkpoint NUMBER" -msgstr "" +msgstr "只要达到 checkpoint NUMBER 指定的数值就执行指定的操作(见下)" #: tests/genfile.c:169 msgid "Set date for next --touch option" -msgstr "" +msgstr "为下一个 --touch 选项设定日期" #: tests/genfile.c:172 msgid "Display executed checkpoints and exit status of COMMAND" -msgstr "" +msgstr "显示执行的 checkpoints 以及 COMMAND 的退出状态" #: tests/genfile.c:177 msgid "" "Synchronous execution actions. These are executed when checkpoint number " "given by --checkpoint option is reached." msgstr "" +"同步执行操作。当达到由 --checkpoint 选项指定的 checkpoint 数值时会执行这些操" +"作。" #: tests/genfile.c:180 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" -msgstr "" +msgstr "截短 FILE 至由前面 --length 选项指定的大小(如果未指定的话，默认 0)" #: tests/genfile.c:184 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." -msgstr "" +msgstr "添加 SIZE 字节至 FILE。SIZE 由前面的 --length 选项指定。" #: tests/genfile.c:187 msgid "Update the access and modification times of FILE" -msgstr "" +msgstr "更新 FILE 的访问和修改时间" #: tests/genfile.c:190 msgid "Execute COMMAND" -msgstr "" +msgstr "执行 COMMAND" #: tests/genfile.c:240 -#, fuzzy, c-format +#, c-format msgid "Invalid size: %s" -msgstr "无效的时间戳" +msgstr "无效的值: %s" #: tests/genfile.c:245 -#, fuzzy, c-format +#, c-format msgid "Number out of allowed range: %s" -msgstr "inode 号超出范围" +msgstr "数值超出所允许的范围: %s" #: tests/genfile.c:248 #, c-format msgid "Negative size: %s" -msgstr "" +msgstr "负值: %s" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" +msgstr "stat(%s) 错误" + +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:268 #, c-format -msgid "Error parsing number near `%s'" +msgid "created file is not sparse" msgstr "" -#: tests/genfile.c:361 -#, fuzzy, c-format +#: tests/genfile.c:353 +#, c-format +msgid "Error parsing number near `%s'" +msgstr "“%s”附近解析数字错误" + +#: tests/genfile.c:359 +#, c-format msgid "Unknown date format" -msgstr "未知的系统错误" +msgstr "未知的数据格式" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" -msgstr "" +msgstr "[ARGS...]" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" -msgstr "" +msgstr "无法打开“%s”" -#: tests/genfile.c:427 -#, fuzzy +#: tests/genfile.c:425 msgid "cannot seek" -msgstr "%s：无法定位到 %s" +msgstr "无法定位" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" -msgstr "" +msgstr "文件名包含空字符" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" -msgstr "" +msgstr "使用 --file 选项无法在标准输出上生成离散文件" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" -msgstr "" +msgstr "不正确的掩码(“%s”附近)" -#: tests/genfile.c:593 tests/genfile.c:626 -#, fuzzy, c-format +#: tests/genfile.c:591 tests/genfile.c:624 +#, c-format msgid "Unknown field `%s'" -msgstr " 未知的文件类型 %s\n" +msgstr "未知的文件掩码位“%s”" -#: tests/genfile.c:653 -#, fuzzy, c-format +#: tests/genfile.c:651 +#, c-format msgid "cannot set time on `%s'" -msgstr "%s：无法定位到 %s" +msgstr "无法设定“%s”的时间" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" -msgstr "" +msgstr "命令成功退出\n" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" -msgstr "" +msgstr "命令出错，状态 %d\n" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" -msgstr "" +msgstr "命令由信号 %d 终止了\n" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" -msgstr "" +msgstr "命令由信号 %d 停止了\n" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" -msgstr "" +msgstr "命令输出 core\n" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" -msgstr "" +msgstr "命令终止\n" -#: tests/genfile.c:853 -#, fuzzy, c-format +#: tests/genfile.c:851 +#, c-format msgid "--stat requires file names" -msgstr "--转换的文件名--\n" +msgstr "--stat 选项需要文件名" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" -msgstr "" +msgstr "参数过多" + +#, fuzzy +#~ msgid "cancel effect of the previous --transform-links option" +#~ msgstr "取消 --delay-directory-restore 选项的效果" + +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "由于前面延迟的错误而退出" #~ msgid "block size" #~ msgstr "块大小" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 000de10b86c227740a3eb0b082a29eccbd0d711a..469d47c32e4e701ff9c2de5ebc58f225fded7be4 100644 GIT binary patch delta 6354 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 F{{!E&`(OY7 diff --git a/po/zh_TW.po b/po/zh_TW.po index 7acaeb7..9f45c99 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.15.1\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-04-14 15:09+0300\n" +"POT-Creation-Date: 2008-12-27 00:44+0200\n" "PO-Revision-Date: 2005-05-10 17:13+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -78,7 +78,7 @@ msgstr " [選項...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "請嘗試‘%s --help’或‘%s --usage’來獲取更多資訊。\n" -#: lib/argp-help.c:1710 src/tar.c:1230 +#: lib/argp-help.c:1710 src/tar.c:1255 #, c-format msgid "Report bugs to %s.\n" msgstr "請向 %s 回報錯誤。\n" @@ -87,17 +87,17 @@ msgstr "請向 %s 回報錯誤。\n" msgid "Unknown system error" msgstr "不明的系統錯誤" -#: lib/argp-parse.c:81 src/tar.c:763 +#: lib/argp-parse.c:81 src/tar.c:773 #, fuzzy msgid "give this help list" msgstr "給出這個使用方式列表" -#: lib/argp-parse.c:82 src/tar.c:764 +#: lib/argp-parse.c:82 src/tar.c:774 #, fuzzy msgid "give a short usage message" msgstr "給出簡短的使用訊息" -#: lib/argp-parse.c:83 src/tar.c:467 src/tar.c:469 src/tar.c:538 +#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 #: tests/genfile.c:129 msgid "NAME" msgstr "名稱" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:769 +#: lib/argp-parse.c:85 src/tar.c:779 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:765 +#: lib/argp-parse.c:142 src/tar.c:775 #, fuzzy msgid "print program version" msgstr "印出程式版本" @@ -133,7 +133,7 @@ msgstr "%s：選項‘%s’需要引數\n" msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "" -#: lib/closeout.c:73 +#: lib/closeout.c:112 msgid "write error" msgstr "" @@ -192,16 +192,16 @@ msgstr "%s：選項‘-W %s’是不明確的\n" msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s：選項‘-W %s’不可配合引數使用\n" -#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1377 +#: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" msgstr "記憶體耗盡" -#: lib/openat-die.c:33 +#: lib/openat-die.c:35 #, fuzzy, c-format msgid "unable to record current working directory" msgstr "無法更改使用中的目錄" -#: lib/openat-die.c:46 +#: lib/openat-die.c:48 #, fuzzy, c-format msgid "failed to return to initial working directory" msgstr "無法儲存使用中的目錄" @@ -317,11 +317,23 @@ msgstr "‘" msgid "'" msgstr "’" -#: lib/rpmatch.c:69 +#. TRANSLATORS: A regular expression testing for an affirmative answer +#. (english: "yes"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^yesexpr=' +#: lib/rpmatch.c:147 msgid "^[yY]" msgstr "" -#: lib/rpmatch.c:72 +#. TRANSLATORS: A regular expression testing for a negative answer +#. (english: "no"). Testing the first character may be sufficient. +#. Take care to consider upper and lower case. +#. To enquire the regular expression that your system uses for this +#. purpose, you can use the command +#. locale -k LC_MESSAGES | grep '^noexpr=' +#: lib/rpmatch.c:160 msgid "^[nN]" msgstr "" @@ -523,101 +535,101 @@ msgstr "檔案突然結束" msgid "Garbage command" msgstr "無用的命令" -#: src/buffer.c:281 src/buffer.c:520 src/buffer.c:1106 src/delete.c:210 -#: src/list.c:167 src/update.c:165 +#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "它不像是 tar 保存檔" -#: src/buffer.c:333 src/buffer.c:342 +#: src/buffer.c:352 src/buffer.c:361 #, fuzzy msgid "Total bytes written" msgstr "已寫入位元組總數: %s (%s, %s/s)\n" -#: src/buffer.c:340 src/buffer.c:354 +#: src/buffer.c:359 src/buffer.c:373 msgid "Total bytes read" msgstr "" -#: src/buffer.c:344 +#: src/buffer.c:363 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "已寫入位元組總數: %s (%s, %s/s)\n" -#: src/buffer.c:433 +#: src/buffer.c:452 msgid "(pipe)" msgstr "(管線)" -#: src/buffer.c:456 +#: src/buffer.c:475 msgid "Invalid value for record_size" msgstr "無效的紀錄大小" -#: src/buffer.c:459 +#: src/buffer.c:478 msgid "No archive name given" msgstr "沒有指定保存檔名稱" -#: src/buffer.c:503 +#: src/buffer.c:522 msgid "Cannot verify stdin/stdout archive" msgstr "無法檢驗標準輸出入保存檔" -#: src/buffer.c:517 +#: src/buffer.c:536 #, c-format msgid "Archive is compressed. Use %s option" msgstr "保存檔已壓縮過。使用 %s 選項" -#: src/buffer.c:566 src/tar.c:2279 +#: src/buffer.c:591 src/tar.c:2318 msgid "Cannot update compressed archives" msgstr "無法更新壓縮的保存檔" -#: src/buffer.c:644 +#: src/buffer.c:670 msgid "At beginning of tape, quitting now" msgstr "開始讀取磁帶時出錯，立刻退出" -#: src/buffer.c:650 +#: src/buffer.c:676 msgid "Too many errors, quitting" msgstr "錯誤過多，必須中止" -#: src/buffer.c:678 -#, c-format -msgid "Unaligned block (%lu byte) in archive" -msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "保存檔中未排列的區塊 (%lu 位元組)" - -#: src/buffer.c:698 +#: src/buffer.c:695 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "紀錄大小 = %lu 區塊" -#: src/buffer.c:771 +#: src/buffer.c:716 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "保存檔中未排列的區塊 (%lu 位元組)" + +#: src/buffer.c:793 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "無法倒退保存檔檔案；沒有 -i 也許會無法讀取" -#: src/buffer.c:803 +#: src/buffer.c:825 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek 無法在紀錄分界處停止" -#: src/buffer.c:859 +#: src/buffer.c:879 #, c-format msgid "%s: contains invalid volume number" msgstr "%s：包含無效的卷冊號碼" -#: src/buffer.c:894 +#: src/buffer.c:914 msgid "Volume number overflow" msgstr "卷冊號碼已滿" -#: src/buffer.c:909 +#: src/buffer.c:929 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "準備好卷冊 #%d 以完成 %s 並按下 return: " -#: src/buffer.c:915 +#: src/buffer.c:935 msgid "EOF where user reply was expected" msgstr "到達期待使用者回答的檔案末端" -#: src/buffer.c:920 src/buffer.c:952 +#: src/buffer.c:940 src/buffer.c:972 msgid "WARNING: Archive is incomplete" msgstr "警告：保存檔不完整" -#: src/buffer.c:934 +#: src/buffer.c:954 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -629,69 +641,75 @@ msgstr "" " ! 產生一個子命令介面\n" " ? 印出本列表\n" -#: src/buffer.c:939 +#: src/buffer.c:959 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:940 +#: src/buffer.c:960 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:947 +#: src/buffer.c:967 msgid "No new volume; exiting.\n" msgstr "沒有新的卷冊；離開。\n" -#: src/buffer.c:980 +#: src/buffer.c:1000 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:993 +#: src/buffer.c:1013 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1044 +#: src/buffer.c:1064 #, fuzzy, c-format msgid "%s command failed" msgstr "‘%s’指令失敗" -#: src/buffer.c:1199 +#: src/buffer.c:1219 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s 在本卷冊中並不連續" -#: src/buffer.c:1203 +#: src/buffer.c:1223 #, c-format msgid "%s is not continued on this volume" msgstr "%s 在本卷冊中並不連續" -#: src/buffer.c:1217 +#: src/buffer.c:1237 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s 的大小有錯誤 (%s != %s + %s)" -#: src/buffer.c:1227 -msgid "This volume is out of sequence" +#: src/buffer.c:1251 +#, fuzzy, c-format +msgid "This volume is out of sequence (%s - %s != %s)" msgstr "本卷冊已超出序列" -#: src/buffer.c:1273 +#: src/buffer.c:1301 #, c-format msgid "Archive not labeled to match %s" msgstr "保存檔未標誌為符合 %s" -#: src/buffer.c:1276 +#: src/buffer.c:1304 #, c-format msgid "Volume %s does not match %s" msgstr "卷冊 %s 不符合 %s" -#: src/buffer.c:1372 +#: src/buffer.c:1400 #, fuzzy, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "%s: 檔名太長，無法儲存於 GNU 多重卷冊表頭之中" +#: src/buffer.c:1619 +#, fuzzy +msgid "write did not end on a block boundary" +msgstr "rmtlseek 無法在紀錄分界處停止" + #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" @@ -702,8 +720,8 @@ msgstr[0] "只能讀取 %2$lu 位元組中的 %1$lu 個" msgid "Contents differ" msgstr "內容不同" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1329 src/list.c:372 -#: src/list.c:1314 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "保存檔的檔案結尾不正常" @@ -818,7 +836,7 @@ msgstr[0] "%s：檔案縮小了 %s 位元組；以零值填補" msgid "%s: file is on a different filesystem; not dumped" msgstr "%s：檔案位於不同的檔案系統；未傾印" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:482 src/incremen.c:488 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 msgid "contents not dumped" msgstr "" @@ -847,7 +865,7 @@ msgstr "%s：這個檔案是保存檔；未傾印" msgid "%s: File removed before we read it" msgstr "%s：當讀取檔案時該檔案已被移除" -#: src/create.c:1591 src/incremen.c:474 +#: src/create.c:1591 src/incremen.c:535 #, fuzzy msgid "directory not dumped" msgstr "%s：包含一個快取目錄標籤；未傾印" @@ -899,170 +917,170 @@ msgstr "%s：擷取目錄的狀態前目錄已更改了名稱" msgid "Extracting contiguous files as regular files" msgstr "正在解開連續的檔案為正常的檔案" -#: src/extract.c:1000 +#: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" msgstr "嘗試解開符號連結為硬式連結" -#: src/extract.c:1057 +#: src/extract.c:1054 #, c-format msgid "Reading %s\n" msgstr "正在讀取“%s”\n" -#: src/extract.c:1146 +#: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s：無法解開 -- 檔案延續自其他卷冊" -#: src/extract.c:1153 src/list.c:1081 +#: src/extract.c:1150 src/list.c:1090 #, fuzzy msgid "Unexpected long name header" msgstr "損毀名稱的檔案結尾不正常" -#: src/extract.c:1159 +#: src/extract.c:1156 #, fuzzy, c-format msgid "%s: Unknown file type `%c', extracted as normal file" msgstr "%s：不明的檔案類型‘%c’，會以普通檔案的方式抽取資料" -#: src/extract.c:1184 +#: src/extract.c:1181 #, fuzzy, c-format msgid "Current %s is newer or same age" msgstr "目前的‘%s’較新" -#: src/extract.c:1230 +#: src/extract.c:1227 #, c-format msgid "%s: Was unable to backup this file" msgstr "%s：無法備份此檔案" -#: src/extract.c:1358 +#: src/extract.c:1355 #, fuzzy, c-format msgid "Cannot rename %s to %s" msgstr "%s：無法改名為 %s" -#: src/extract.c:1370 +#: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" msgstr "發生無法復原的錯誤：立刻退出" -#: src/incremen.c:390 src/incremen.c:430 +#: src/incremen.c:445 src/incremen.c:489 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s：目錄已被變更名稱" -#: src/incremen.c:400 +#: src/incremen.c:457 #, c-format msgid "%s: Directory has been renamed" msgstr "%s：目錄已被變更名稱" -#: src/incremen.c:441 +#: src/incremen.c:502 #, c-format msgid "%s: Directory is new" msgstr "%s：目錄是新的" -#: src/incremen.c:833 src/incremen.c:850 +#: src/incremen.c:893 src/incremen.c:910 msgid "Invalid time stamp" msgstr "無效的時間標記" -#: src/incremen.c:889 +#: src/incremen.c:949 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "選項中的模式無效" -#: src/incremen.c:904 +#: src/incremen.c:964 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:924 +#: src/incremen.c:984 msgid "Invalid device number" msgstr "無效的裝置號碼" -#: src/incremen.c:939 +#: src/incremen.c:999 msgid "Invalid inode number" msgstr "無效的 inode 號碼" -#: src/incremen.c:990 src/incremen.c:1027 +#: src/incremen.c:1050 src/incremen.c:1087 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:997 src/incremen.c:1035 +#: src/incremen.c:1057 src/incremen.c:1095 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:999 src/incremen.c:1039 src/incremen.c:1091 -#: src/incremen.c:1149 +#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 +#: src/incremen.c:1209 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "保存檔的檔案結尾不正常" -#: src/incremen.c:1006 src/incremen.c:1046 +#: src/incremen.c:1066 src/incremen.c:1106 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1141 +#: src/incremen.c:1201 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1192 src/incremen.c:1195 +#: src/incremen.c:1252 src/incremen.c:1255 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1214 +#: src/incremen.c:1274 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1369 +#: src/incremen.c:1429 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1379 +#: src/incremen.c:1439 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1392 +#: src/incremen.c:1452 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "未成形的密度引數: '%s'" -#: src/incremen.c:1405 +#: src/incremen.c:1465 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1411 +#: src/incremen.c:1471 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "未成形的密度引數: '%s'" -#: src/incremen.c:1431 +#: src/incremen.c:1491 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1437 +#: src/incremen.c:1497 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1481 +#: src/incremen.c:1541 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1603 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s：未能清空目錄；無法顯示狀態" -#: src/incremen.c:1556 +#: src/incremen.c:1616 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s：目錄位於不同的裝置；無法清空" -#: src/incremen.c:1564 +#: src/incremen.c:1624 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在刪除 %s\n" -#: src/incremen.c:1569 +#: src/incremen.c:1629 #, c-format msgid "%s: Cannot remove" msgstr "%s：無法移除" @@ -1082,86 +1100,86 @@ msgstr "區塊 %s：** 空虛的區塊 **\n" msgid "block %s: ** End of File **\n" msgstr "區塊 %s：** 檔案末端 **\n" -#: src/list.c:178 src/list.c:1054 src/list.c:1282 +#: src/list.c:178 src/list.c:1063 src/list.c:1291 #, c-format msgid "block %s: " msgstr "區塊 %s：" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, etc.) -#: src/list.c:662 +#: src/list.c:671 #, 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:717 +#: src/list.c:726 #, 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:728 +#: src/list.c:737 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "保存檔八進位數值 %.*s 超出 %s 範圍" -#: src/list.c:749 +#: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" msgstr "保存檔含有過時的 base-64 標頭" -#: src/list.c:763 +#: src/list.c:772 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "保存檔有號 base-64 字串 %s 超出 %s 範圍" -#: src/list.c:794 +#: src/list.c:803 #, 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:823 +#: src/list.c:832 #, 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:845 +#: src/list.c:854 #, fuzzy, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "保存檔值 %s 已超出 %s 的範圍 %s.%s" -#: src/list.c:1217 +#: src/list.c:1226 #, c-format msgid " link to %s\n" msgstr " 連結至 %s\n" -#: src/list.c:1225 +#: src/list.c:1234 #, c-format msgid " unknown file type %s\n" msgstr "不明的檔案類型 %s\n" -#: src/list.c:1243 +#: src/list.c:1252 #, c-format msgid "--Long Link--\n" msgstr "--長 連 結--\n" -#: src/list.c:1247 +#: src/list.c:1256 #, c-format msgid "--Long Name--\n" msgstr "--長 名 稱--\n" -#: src/list.c:1251 +#: src/list.c:1260 #, c-format msgid "--Volume Header--\n" msgstr "--卷 冊 標 é ­--\n" -#: src/list.c:1259 +#: src/list.c:1268 #, c-format msgid "--Continued at byte %s--\n" msgstr "─由第 %s 位元組繼續─\n" -#: src/list.c:1287 +#: src/list.c:1296 msgid "Creating directory:" msgstr "正在建立目錄：" @@ -1198,24 +1216,24 @@ msgstr "行程內通道" #. TRANSLATORS: The following three msgids form a single sentence. #. -#: src/names.c:599 +#: src/names.c:593 msgid "Pattern matching characters used in file names. Please," msgstr "" -#: src/names.c:601 +#: src/names.c:595 msgid "use --wildcards to enable pattern matching, or --no-wildcards to" msgstr "" -#: src/names.c:603 +#: src/names.c:597 msgid "suppress this warning." msgstr "" -#: src/names.c:618 src/names.c:636 +#: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" msgstr "%s：保存檔中無法找到" -#: src/names.c:621 +#: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s：要求的事件在保存檔中找不到" @@ -1240,7 +1258,7 @@ msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:334 +#: src/tar.c:336 #, fuzzy msgid "" "GNU `tar' saves many files together into a single tape or disk archive, and " @@ -1259,7 +1277,7 @@ msgstr "" " %s -tvf archive.tar # 詳細列出 archive.tar 中的所有檔案。\n" " %s -xf archive.tar # 抽取 archive.tar 中的所有檔案。\n" -#: src/tar.c:343 +#: src/tar.c:345 #, fuzzy msgid "" "The backup suffix is `~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1287,86 +1305,86 @@ msgstr "" " nil, existing 若有數字的備份檔已經存在則使用數字，否則使用普通方式備份\n" " never, simple 永遠使用普通方式備份\n" -#: src/tar.c:369 +#: src/tar.c:371 msgid "Main operation mode:" msgstr "主要操作模式:" -#: src/tar.c:372 +#: src/tar.c:374 msgid "list the contents of an archive" msgstr "列出保存檔的內容" -#: src/tar.c:374 +#: src/tar.c:376 msgid "extract files from an archive" msgstr "從保存檔中解開檔案" -#: src/tar.c:377 +#: src/tar.c:379 msgid "create a new archive" msgstr "建立一個新的保存檔" -#: src/tar.c:379 +#: src/tar.c:381 msgid "find differences between archive and file system" msgstr "在保存檔與檔案系統之間找出差異" -#: src/tar.c:382 +#: src/tar.c:384 msgid "append files to the end of an archive" msgstr "加入檔案到保存檔末端" -#: src/tar.c:384 +#: src/tar.c:386 msgid "only append files newer than copy in archive" msgstr "只加入比保存檔中複本還新的檔案" -#: src/tar.c:386 +#: src/tar.c:388 msgid "append tar files to an archive" msgstr "加入 tar 檔案到保存檔中" -#: src/tar.c:389 +#: src/tar.c:391 msgid "delete from the archive (not on mag tapes!)" msgstr "從保存檔中刪除 (並非在磁帶上！)" -#: src/tar.c:391 +#: src/tar.c:393 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:396 +#: src/tar.c:398 msgid "Operation modifiers:" msgstr "運算變更項:" -#: src/tar.c:399 +#: src/tar.c:401 msgid "handle sparse files efficiently" msgstr "有效率地處理稀疏的檔案" -#: src/tar.c:400 +#: src/tar.c:402 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:401 +#: src/tar.c:403 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:403 +#: src/tar.c:405 msgid "handle old GNU-format incremental backup" msgstr "處理舊型 GNU-格式之漸進式備份" -#: src/tar.c:404 src/tar.c:541 src/tar.c:614 src/tar.c:618 src/tar.c:628 -#: src/tar.c:638 src/tar.c:641 src/tar.c:643 src/tar.c:725 tests/genfile.c:131 +#: src/tar.c:406 src/tar.c:543 src/tar.c:621 src/tar.c:625 src/tar.c:637 +#: src/tar.c:647 src/tar.c:650 src/tar.c:652 src/tar.c:735 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "檔案" -#: src/tar.c:405 +#: src/tar.c:407 msgid "handle new GNU-format incremental backup" msgstr "處理新型 GNU-格式之漸進式備份" -#: src/tar.c:407 +#: src/tar.c:409 msgid "do not exit with nonzero on unreadable files" msgstr "離開無法讀取的檔案時不要回傳非零的值" -#: src/tar.c:408 src/tar.c:536 src/tar.c:551 src/tar.c:675 src/tar.c:710 +#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 #: tests/genfile.c:165 msgid "NUMBER" msgstr "數目" -#: src/tar.c:409 +#: src/tar.c:411 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1378,304 +1396,304 @@ msgstr "" "delete、--diff、--extract 或 --list 等次命令之一合併使用時才有效，而且要經由" "命令列 或是 -T 選項來提供一個檔案序列。預設的數目是 1。" -#: src/tar.c:415 +#: src/tar.c:417 #, fuzzy msgid "archive is seekable" msgstr "保存檔是可搜尋的" -#: src/tar.c:417 +#: src/tar.c:419 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:420 +#: src/tar.c:422 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:426 +#: src/tar.c:428 msgid "Overwrite control:" msgstr "" -#: src/tar.c:429 +#: src/tar.c:431 msgid "attempt to verify the archive after writing it" msgstr "嘗試在寫入之後驗證保存檔" -#: src/tar.c:431 +#: src/tar.c:433 msgid "remove files after adding them to the archive" msgstr "在加入檔案至保存檔之後移除它們" -#: src/tar.c:433 +#: src/tar.c:435 msgid "don't replace existing files when extracting" msgstr "解開時不要替換既有的檔案" -#: src/tar.c:435 +#: src/tar.c:437 msgid "don't replace existing files that are newer than their archive copies" msgstr "不要替換既有且比它們在保存檔中複本還新的檔案" -#: src/tar.c:437 +#: src/tar.c:439 msgid "overwrite existing files when extracting" msgstr "解開時覆寫既有檔案" -#: src/tar.c:439 +#: src/tar.c:441 msgid "remove each file prior to extracting over it" msgstr "在解開並覆寫檔案之前先移除它" -#: src/tar.c:441 +#: src/tar.c:443 msgid "empty hierarchies prior to extracting directory" msgstr "在解開目錄之前先清空目錄階層" -#: src/tar.c:443 +#: src/tar.c:445 msgid "preserve metadata of existing directories" msgstr "保留既有目錄的原始資料" -#: src/tar.c:445 +#: src/tar.c:447 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "解開時覆寫既有檔案" -#: src/tar.c:451 +#: src/tar.c:453 msgid "Select output stream:" msgstr "" -#: src/tar.c:454 +#: src/tar.c:456 msgid "extract files to standard output" msgstr "解開檔案至標準輸出" -#: src/tar.c:455 src/tar.c:514 src/tar.c:516 tests/genfile.c:162 +#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "命令" -#: src/tar.c:456 +#: src/tar.c:458 #, fuzzy msgid "pipe extracted files to another program" msgstr "解開檔案至標準輸出" -#: src/tar.c:458 +#: src/tar.c:460 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:460 +#: src/tar.c:462 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:465 +#: src/tar.c:467 msgid "Handling of file attributes:" msgstr "檔案屬性的處理:" -#: src/tar.c:468 +#: src/tar.c:470 msgid "force NAME as owner for added files" msgstr "強制以名稱做為加入檔案的擁有者" -#: src/tar.c:470 +#: src/tar.c:472 msgid "force NAME as group for added files" msgstr "強制以名稱做為加入檔案的群組" -#: src/tar.c:471 src/tar.c:661 +#: src/tar.c:473 src/tar.c:670 msgid "DATE-OR-FILE" msgstr "檔案的日期" -#: src/tar.c:472 +#: src/tar.c:474 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "只儲存比 DATE-OF-FILE 還新的檔案" -#: src/tar.c:473 +#: src/tar.c:475 msgid "CHANGES" msgstr "變更" -#: src/tar.c:474 +#: src/tar.c:476 msgid "force (symbolic) mode CHANGES for added files" msgstr "強制以(符號)變更做為加入檔案的模式" -#: src/tar.c:476 +#: src/tar.c:478 msgid "METHOD" msgstr "" -#: src/tar.c:477 +#: src/tar.c:479 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:481 +#: src/tar.c:483 msgid "don't extract file modified time" msgstr "不要解開檔案的修改時間" -#: src/tar.c:483 +#: src/tar.c:485 msgid "try extracting files with the same ownership" msgstr "嘗試以相同的擁有身分去解開檔案" -#: src/tar.c:485 +#: src/tar.c:487 msgid "extract files as yourself" msgstr "以自己的身分解開檔案" -#: src/tar.c:487 +#: src/tar.c:489 msgid "always use numbers for user/group names" msgstr "總是使用數字做為使用者/群組名稱" -#: src/tar.c:489 +#: src/tar.c:491 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:493 +#: src/tar.c:495 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:497 msgid "sort names to extract to match archive" msgstr "解開時依名稱排序以符合保存檔" -#: src/tar.c:498 +#: src/tar.c:500 msgid "same as both -p and -s" msgstr "等同於指定 -p 與 -s" -#: src/tar.c:500 +#: src/tar.c:502 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:503 +#: src/tar.c:505 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:508 +#: src/tar.c:510 msgid "Device selection and switching:" msgstr "裝置選擇與切換:" -#: src/tar.c:510 +#: src/tar.c:512 msgid "ARCHIVE" msgstr "保存檔" -#: src/tar.c:511 +#: src/tar.c:513 msgid "use archive file or device ARCHIVE" msgstr "使用保存檔檔案或保存檔裝置" -#: src/tar.c:513 +#: src/tar.c:515 #, fuzzy msgid "archive file is local even if it has a colon" msgstr "即使具有冒號，保存檔檔案仍位於本地端" -#: src/tar.c:515 +#: src/tar.c:517 msgid "use given rmt COMMAND instead of rmt" msgstr "使用賦予的 rmt 命令以取代 rmt" -#: src/tar.c:517 +#: src/tar.c:519 msgid "use remote COMMAND instead of rsh" msgstr "使用遠端的命令以取代 rsh" -#: src/tar.c:521 +#: src/tar.c:523 msgid "specify drive and density" msgstr "指定磁碟機與記錄密度" -#: src/tar.c:535 +#: src/tar.c:537 msgid "create/list/extract multi-volume archive" msgstr "建立/列表/解開 多重卷冊的保存檔" -#: src/tar.c:537 +#: src/tar.c:539 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "在寫入 NUMBER x 1024 位元組之後更換磁帶" -#: src/tar.c:539 +#: src/tar.c:541 msgid "run script at end of each tape (implies -M)" msgstr "在每卷磁帶末端執行命令稿 (意指 -M)" -#: src/tar.c:542 +#: src/tar.c:544 msgid "use/update the volume number in FILE" msgstr "使用/更新 FILE 中的卷冊號碼" -#: src/tar.c:547 +#: src/tar.c:549 msgid "Device blocking:" msgstr "裝置分區:" -#: src/tar.c:549 +#: src/tar.c:551 msgid "BLOCKS" msgstr "區塊" -#: src/tar.c:550 +#: src/tar.c:552 msgid "BLOCKS x 512 bytes per record" msgstr "每筆紀錄含有 BLOCKS x 512 位元組" -#: src/tar.c:552 +#: src/tar.c:554 #, fuzzy msgid "NUMBER of bytes per record, multiple of 512" msgstr "每筆紀錄 SIZE 位元組，為 512 的倍數" -#: src/tar.c:554 +#: src/tar.c:556 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "忽略保存檔中零值的區塊 (意指 EOF)" -#: src/tar.c:556 +#: src/tar.c:558 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "讀取時重新分區 (用於 4.2BSD 管線)" -#: src/tar.c:561 +#: src/tar.c:563 msgid "Archive format selection:" msgstr "保存檔格式選擇:" -#: src/tar.c:563 tests/genfile.c:152 +#: src/tar.c:565 tests/genfile.c:152 msgid "FORMAT" msgstr "格式" -#: src/tar.c:564 +#: src/tar.c:566 #, fuzzy msgid "create archive of the given format" msgstr "以給定格式建立保存檔。" -#: src/tar.c:566 +#: src/tar.c:568 msgid "FORMAT is one of the following:" msgstr "符合下列任一格式:" -#: src/tar.c:567 +#: src/tar.c:569 msgid "old V7 tar format" msgstr "舊式 V7 tar 格式" -#: src/tar.c:570 +#: src/tar.c:572 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 之 GNU 格式" -#: src/tar.c:572 +#: src/tar.c:574 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x 格式" -#: src/tar.c:574 +#: src/tar.c:576 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) 格式" -#: src/tar.c:576 +#: src/tar.c:578 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) 格式" -#: src/tar.c:577 +#: src/tar.c:579 #, fuzzy msgid "same as pax" msgstr "等同 pax" -#: src/tar.c:580 +#: src/tar.c:582 msgid "same as --format=v7" msgstr "等同 --format=v7" -#: src/tar.c:583 +#: src/tar.c:585 msgid "same as --format=posix" msgstr "等同 --format=posix" -#: src/tar.c:584 +#: src/tar.c:586 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "關鍵字[[:]=值][,關鍵字[[:]=值], ...]" -#: src/tar.c:585 +#: src/tar.c:587 msgid "control pax keywords" msgstr "控制 pax 的關鍵字" -#: src/tar.c:586 +#: src/tar.c:588 msgid "TEXT" msgstr "文字" -#: src/tar.c:587 +#: src/tar.c:589 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " @@ -1683,178 +1701,191 @@ msgid "" msgstr "" "以卷冊名稱 NAME 來建立保存檔。在列表/解開時，使用 TEXT 做為萬用比對樣式" -#: src/tar.c:592 +#: src/tar.c:594 #, fuzzy msgid "Compression options:" msgstr "有關壓縮的選項互相抵觸" -#: src/tar.c:594 +#: src/tar.c:596 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:596 +#: src/tar.c:598 +msgid "do not use use archive suffix to determine the compression program" +msgstr "" + +#: src/tar.c:601 msgid "filter the archive through bzip2" msgstr "保存檔以 bzip2 過濾處理" -#: src/tar.c:598 +#: src/tar.c:603 msgid "filter the archive through gzip" msgstr "保存檔以 gzip 過濾處理" -#: src/tar.c:602 +#: src/tar.c:607 msgid "filter the archive through compress" msgstr "保存檔以 compress 過濾處理" -#: src/tar.c:605 +#: src/tar.c:610 #, fuzzy msgid "filter the archive through lzma" msgstr "保存檔以 gzip 過濾處理" -#: src/tar.c:606 +#: src/tar.c:612 +#, fuzzy +msgid "filter the archive through lzop" +msgstr "保存檔以 gzip 過濾處理" + +#: src/tar.c:613 msgid "PROG" msgstr "程式" -#: src/tar.c:607 +#: src/tar.c:614 msgid "filter through PROG (must accept -d)" msgstr "以 PROG 過濾處理 (必須接受 -d)" -#: src/tar.c:612 +#: src/tar.c:619 msgid "Local file selection:" msgstr "本機檔案選擇:" -#: src/tar.c:615 +#: src/tar.c:622 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:616 +#: src/tar.c:623 msgid "DIR" msgstr "目錄" -#: src/tar.c:617 +#: src/tar.c:624 msgid "change to directory DIR" msgstr "更改至目錄 DIR" -#: src/tar.c:619 +#: src/tar.c:626 #, fuzzy msgid "get names to extract or create from FILE" msgstr "從檔案 NAME 中取得要解開或建立的名稱" -#: src/tar.c:621 +#: src/tar.c:628 msgid "-T reads null-terminated names, disable -C" msgstr "-T 讀取零值終結的名稱，停用 -C" -#: src/tar.c:623 +#: src/tar.c:630 +msgid "disable the effect of the previous --null option" +msgstr "" + +#: src/tar.c:632 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:625 +#: src/tar.c:634 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:626 tests/genfile.c:135 +#: src/tar.c:635 tests/genfile.c:135 msgid "PATTERN" msgstr "樣式" -#: src/tar.c:627 +#: src/tar.c:636 msgid "exclude files, given as a PATTERN" msgstr "排除給定樣式的檔案" -#: src/tar.c:629 +#: src/tar.c:638 msgid "exclude patterns listed in FILE" msgstr "排除 FILE 中所列出的樣式" -#: src/tar.c:631 +#: src/tar.c:640 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:634 +#: src/tar.c:643 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:637 +#: src/tar.c:646 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:639 +#: src/tar.c:648 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:642 +#: src/tar.c:651 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:644 +#: src/tar.c:653 #, fuzzy msgid "exclude directories containing FILE" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:646 +#: src/tar.c:655 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:648 +#: src/tar.c:657 msgid "avoid descending automatically in directories" msgstr "避免自動在目錄中下降" -#: src/tar.c:650 +#: src/tar.c:659 msgid "stay in local file system when creating archive" msgstr "建立保存檔時保持在本地檔案系統中" -#: src/tar.c:652 +#: src/tar.c:661 msgid "recurse into directories (default)" msgstr "遞迴進入目錄 (預設)" -#: src/tar.c:654 +#: src/tar.c:663 msgid "don't strip leading `/'s from file names" msgstr "不要從檔案名稱中截去前導的 '/'" -#: src/tar.c:656 +#: src/tar.c:665 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:658 +#: src/tar.c:667 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:659 +#: src/tar.c:668 msgid "MEMBER-NAME" msgstr "成員-名稱" -#: src/tar.c:660 +#: src/tar.c:669 msgid "begin at member MEMBER-NAME in the archive" msgstr "從保存檔中名為 MEMBER-NAME 的成員開始" -#: src/tar.c:662 +#: src/tar.c:671 msgid "only store files newer than DATE-OR-FILE" msgstr "只儲存比 DATE-OF-FILE 還新的檔案" -#: src/tar.c:664 +#: src/tar.c:673 msgid "DATE" msgstr "日期" -#: src/tar.c:665 +#: src/tar.c:674 msgid "compare date and time when data changed only" msgstr "只有當資料變更時才比較日期和時間" -#: src/tar.c:666 +#: src/tar.c:675 msgid "CONTROL" msgstr "控制" -#: src/tar.c:667 +#: src/tar.c:676 msgid "backup before removal, choose version CONTROL" msgstr "移除前先備份，選擇版本 CONTROL" -#: src/tar.c:668 src/tar.c:742 src/tar.c:744 tests/genfile.c:168 +#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 msgid "STRING" msgstr "字串" -#: src/tar.c:669 +#: src/tar.c:678 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -1863,95 +1894,95 @@ msgstr "" "移除前先備份並覆蓋一般後置文字 '~'，除非被環境變數 SIMPLE_BACKUP_SUFFIX 所覆" "蓋" -#: src/tar.c:674 +#: src/tar.c:683 msgid "File name transformations:" msgstr "" -#: src/tar.c:676 +#: src/tar.c:685 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "從檔案名稱中截去以 NUMBER 為首的成分" -#: src/tar.c:678 +#: src/tar.c:687 msgid "EXPRESSION" msgstr "" -#: src/tar.c:679 +#: src/tar.c:688 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:684 +#: src/tar.c:694 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:687 +#: src/tar.c:697 #, fuzzy msgid "ignore case" msgstr "排除時忽略大小寫" -#: src/tar.c:689 +#: src/tar.c:699 #, fuzzy msgid "patterns match file name start" msgstr "排除樣式會比對檔案名稱開頭" -#: src/tar.c:691 +#: src/tar.c:701 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "排除樣式會比對任一 '/' 後端 (預設)" -#: src/tar.c:693 +#: src/tar.c:703 #, fuzzy msgid "case sensitive matching (default)" msgstr "排除樣式忽略大小寫" -#: src/tar.c:695 +#: src/tar.c:705 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:697 +#: src/tar.c:707 msgid "verbatim string matching" msgstr "" -#: src/tar.c:699 +#: src/tar.c:709 #, fuzzy msgid "wildcards do not match `/'" msgstr "排除樣式之萬用字元不會符合 '/'" -#: src/tar.c:701 +#: src/tar.c:711 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "排除樣式之萬用字元會符合 '/' (預設)" -#: src/tar.c:706 +#: src/tar.c:716 msgid "Informative output:" msgstr "富含資訊的輸出:" -#: src/tar.c:709 +#: src/tar.c:719 msgid "verbosely list files processed" msgstr "詳細列出處理過的檔案" -#: src/tar.c:711 +#: src/tar.c:721 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "每 10 項紀錄顯示一次進度訊息" -#: src/tar.c:713 +#: src/tar.c:723 msgid "ACTION" msgstr "" -#: src/tar.c:714 +#: src/tar.c:724 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:717 +#: src/tar.c:727 msgid "print a message if not all links are dumped" msgstr "如果並非所有連結都被傾印則印出一條訊息" -#: src/tar.c:718 +#: src/tar.c:728 msgid "SIGNAL" msgstr "" -#: src/tar.c:719 +#: src/tar.c:729 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1959,116 +1990,116 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:724 +#: src/tar.c:734 msgid "print file modification dates in UTC" msgstr "以 UTC 格式印出檔案修改日期" -#: src/tar.c:726 +#: src/tar.c:736 msgid "send verbose output to FILE" msgstr "將詳細輸出送至 FILE" -#: src/tar.c:728 +#: src/tar.c:738 msgid "show block number within archive with each message" msgstr "每則訊息附帶顯示在保存檔中的區塊號碼" -#: src/tar.c:730 +#: src/tar.c:740 msgid "ask for confirmation for every action" msgstr "任何動作都要求確認" -#: src/tar.c:733 +#: src/tar.c:743 #, fuzzy msgid "show tar defaults" msgstr "顯示 tar 預設值" -#: src/tar.c:735 +#: src/tar.c:745 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "當表列或解開時，列出每一個不符合搜尋條件的目錄" -#: src/tar.c:737 +#: src/tar.c:747 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:740 +#: src/tar.c:750 msgid "STYLE" msgstr "" -#: src/tar.c:741 +#: src/tar.c:751 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:743 +#: src/tar.c:753 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:745 +#: src/tar.c:755 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:750 +#: src/tar.c:760 msgid "Compatibility options:" msgstr "相容性選項:" -#: src/tar.c:753 +#: src/tar.c:763 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "當建立時，等同於 --old-archive。當解開時，等同於 --no-same-owner" -#: src/tar.c:758 +#: src/tar.c:768 msgid "Other options:" msgstr "其他選項:" -#: src/tar.c:761 +#: src/tar.c:771 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:899 +#: src/tar.c:919 msgid "You may not specify more than one `-Acdtrux' option" msgstr "不可指定‘-Acdtrux’當中多於一個的選項" -#: src/tar.c:909 +#: src/tar.c:929 msgid "Conflicting compression options" msgstr "有關壓縮的選項互相抵觸" -#: src/tar.c:965 +#: src/tar.c:985 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "不明的檔案類型 %s\n" -#: src/tar.c:989 +#: src/tar.c:1009 #, fuzzy msgid "Date sample file not found" msgstr "找不到用作擷取時間資料的檔案" -#: src/tar.c:997 +#: src/tar.c:1017 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "以 %s 代替不明的日期格式 %s" -#: src/tar.c:1022 +#: src/tar.c:1042 #, fuzzy, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "以 %2$s + %3$ld 柰秒的格式來處理日期 '%1$s'" -#: src/tar.c:1096 +#: src/tar.c:1119 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s：這個檔案是保存檔；未傾印" -#: src/tar.c:1159 +#: src/tar.c:1184 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1224 +#: src/tar.c:1249 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1227 +#: src/tar.c:1252 msgid "" "\n" "*This* tar defaults to:\n" @@ -2076,151 +2107,165 @@ msgstr "" "\n" "*這個* tar 預設為:\n" -#: src/tar.c:1264 +#: src/tar.c:1293 msgid "Invalid blocking factor" msgstr "無效的分區因素" -#: src/tar.c:1340 +#: src/tar.c:1369 msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" msgstr "警告：不再支援 -I 選項；也許你是指 -j 或 -T 選項？" -#: src/tar.c:1373 +#: src/tar.c:1406 msgid "Invalid tape length" msgstr "無效的磁帶長度" -#: src/tar.c:1409 +#: src/tar.c:1442 msgid "More than one threshold date" msgstr "一個以上的限定日期" -#: src/tar.c:1464 src/tar.c:1467 +#: src/tar.c:1497 src/tar.c:1500 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1552 +#: src/tar.c:1585 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1577 +#: src/tar.c:1610 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1678 +#: src/tar.c:1711 #, c-format msgid "%s: Invalid group" msgstr "%s：無效的群組" -#: src/tar.c:1685 +#: src/tar.c:1718 msgid "Invalid mode given on option" msgstr "選項中的模式無效" -#: src/tar.c:1738 +#: src/tar.c:1775 msgid "Invalid number" msgstr "無效的號碼" -#: src/tar.c:1760 +#: src/tar.c:1797 msgid "Invalid owner" msgstr "無效的擁有者" -#: src/tar.c:1794 +#: src/tar.c:1823 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" + +#: src/tar.c:1833 msgid "Invalid record size" msgstr "無效的紀錄大小" -#: src/tar.c:1797 +#: src/tar.c:1836 #, c-format msgid "Record size must be a multiple of %d." msgstr "紀錄大小必須是 %d 的倍數。" -#: src/tar.c:1834 +#: src/tar.c:1873 msgid "Invalid number of elements" msgstr "無效的元素號碼" -#: src/tar.c:1854 +#: src/tar.c:1893 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1930 +#: src/tar.c:1969 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "未成形的密度引數: '%s'" -#: src/tar.c:1956 +#: src/tar.c:1995 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "未知的密度: '%c'" -#: src/tar.c:1973 +#: src/tar.c:2012 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "此版本的 tar 不支援‘-[0-7][lmh]’選項" -#: src/tar.c:2008 +#: src/tar.c:2047 msgid "[FILE]..." msgstr "[FILE]..." -#: src/tar.c:2114 +#: src/tar.c:2153 #, c-format msgid "Old option `%c' requires an argument." msgstr "舊式的選項‘%c’需要引數。" -#: src/tar.c:2196 +#: src/tar.c:2235 msgid "--occurrence is meaningless without a file list" msgstr "若無檔案列表，--occurrence 便不具意義" -#: src/tar.c:2202 +#: src/tar.c:2241 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence 不可使用於要求的作業模式" -#: src/tar.c:2232 +#: src/tar.c:2271 msgid "Multiple archive files require `-M' option" msgstr "指定多個保存檔時需要‘-M’選項" -#: src/tar.c:2237 +#: src/tar.c:2276 msgid "Cannot combine --listed-incremental with --newer" msgstr "無法同時使用 --listed-incremental 及 --newer 選項" -#: src/tar.c:2254 +#: src/tar.c:2293 #, 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:2267 +#: src/tar.c:2306 msgid "Cannot verify multi-volume archives" msgstr "無法檢驗多重卷冊的保存檔" -#: src/tar.c:2269 +#: src/tar.c:2308 msgid "Cannot verify compressed archives" msgstr "無法檢驗壓縮的保存檔" -#: src/tar.c:2275 +#: src/tar.c:2314 msgid "Cannot use multi-volume compressed archives" msgstr "無法使用多重卷冊的壓縮保存檔" -#: src/tar.c:2281 +#: src/tar.c:2320 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "無法更新壓縮的保存檔" -#: src/tar.c:2293 +#: src/tar.c:2332 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option 只能用於 POSIX 保存檔" -#: src/tar.c:2318 +#: src/tar.c:2350 +msgid "Volume length cannot be less than record size" +msgstr "" + +#: src/tar.c:2353 +msgid "--preserve-order is not compatible with --listed-incremental" +msgstr "" + +#: src/tar.c:2364 msgid "Cowardly refusing to create an empty archive" msgstr "拒絕建立空白的保存檔" -#: src/tar.c:2343 +#: src/tar.c:2389 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "‘-Aru’及‘-f -’選項互不兼容" -#: src/tar.c:2432 +#: src/tar.c:2478 msgid "You must specify one of the `-Acdtrux' options" msgstr "必須指定‘-Acdtrux’選項的其中一個" -#: src/tar.c:2483 +#: src/tar.c:2529 #, c-format -msgid "Error exit delayed from previous errors" -msgstr "發生錯誤離開時因之前的錯誤而延遲" +msgid "Exiting with failure status due to previous errors" +msgstr "" #: src/update.c:86 #, c-format @@ -2228,82 +2273,82 @@ msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s：檔案縮減了 %s 位元組" -#: src/xheader.c:158 +#: src/xheader.c:156 #, fuzzy, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "關鍵字 %s 為未知或尚未實作" -#: src/xheader.c:184 +#: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" msgstr "樣式 %s 無法被使用" -#: src/xheader.c:194 +#: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" msgstr "關鍵字 %s 無法被蓋過" -#: src/xheader.c:498 +#: src/xheader.c:496 #, fuzzy msgid "Malformed extended header: missing length" msgstr "未成形的擴充標頭：缺少等號" -#: src/xheader.c:506 +#: src/xheader.c:504 msgid "Extended header length is out of allowed range" msgstr "" -#: src/xheader.c:513 +#: src/xheader.c:511 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "保存檔有號 base-64 字串 %s 超出 %s 範圍" -#: src/xheader.c:525 +#: src/xheader.c:523 #, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "未成形的擴充標頭：在長度之後缺少空白" -#: src/xheader.c:533 +#: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" msgstr "未成形的擴充標頭：缺少等號" -#: src/xheader.c:539 +#: src/xheader.c:537 #, fuzzy msgid "Malformed extended header: missing newline" msgstr "未成形的擴充標頭：缺少等號" -#: src/xheader.c:576 +#: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" msgstr "" -#: src/xheader.c:780 +#: src/xheader.c:778 #, 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:812 +#: src/xheader.c:810 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "保存檔值 %s 已超出 %s 的範圍 %s.%s" -#: src/xheader.c:943 src/xheader.c:973 src/xheader.c:1287 +#: src/xheader.c:941 src/xheader.c:971 src/xheader.c:1285 #, fuzzy, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "未成形的擴充標頭：缺少等號" -#: src/xheader.c:1240 src/xheader.c:1265 src/xheader.c:1315 +#: src/xheader.c:1238 src/xheader.c:1263 src/xheader.c:1313 #, fuzzy, c-format msgid "Malformed extended header: excess %s=%s" msgstr "未成形的擴充標頭：缺少等號" -#: src/xheader.c:1328 +#: src/xheader.c:1326 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "未成形的擴充標頭：缺少等號" -#: src/xheader.c:1338 +#: src/xheader.c:1336 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "未成形的擴充標頭：缺少等號" @@ -2470,97 +2515,107 @@ msgstr "Inode 號碼超出範圍以外" msgid "Negative size: %s" msgstr "" -#: tests/genfile.c:261 tests/genfile.c:560 +#: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" msgstr "" -#: tests/genfile.c:355 +#: tests/genfile.c:264 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "" + +#: tests/genfile.c:268 +#, c-format +msgid "created file is not sparse" +msgstr "" + +#: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" msgstr "" -#: tests/genfile.c:361 +#: tests/genfile.c:359 #, fuzzy, c-format msgid "Unknown date format" msgstr "不明的系統錯誤" -#: tests/genfile.c:384 +#: tests/genfile.c:382 msgid "[ARGS...]" msgstr "" -#: tests/genfile.c:421 tests/genfile.c:461 tests/genfile.c:514 -#: tests/genfile.c:664 tests/genfile.c:678 +#: tests/genfile.c:419 tests/genfile.c:459 tests/genfile.c:512 +#: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" msgstr "" -#: tests/genfile.c:427 +#: tests/genfile.c:425 #, fuzzy msgid "cannot seek" msgstr "close 程序失敗" -#: tests/genfile.c:444 +#: tests/genfile.c:442 #, c-format msgid "file name contains null character" msgstr "" -#: tests/genfile.c:509 +#: tests/genfile.c:507 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -#: tests/genfile.c:587 +#: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" msgstr "" -#: tests/genfile.c:593 tests/genfile.c:626 +#: tests/genfile.c:591 tests/genfile.c:624 #, fuzzy, c-format msgid "Unknown field `%s'" msgstr "不明的檔案類型 %s\n" -#: tests/genfile.c:653 +#: tests/genfile.c:651 #, fuzzy, c-format msgid "cannot set time on `%s'" msgstr "%s：無法搜尋至 %s" -#: tests/genfile.c:807 +#: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" msgstr "" -#: tests/genfile.c:809 +#: tests/genfile.c:807 #, fuzzy, c-format msgid "Command failed with status %d\n" msgstr "副程序因訊號 %d 而突然終止" -#: tests/genfile.c:813 +#: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" msgstr "" -#: tests/genfile.c:815 +#: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" msgstr "" -#: tests/genfile.c:818 +#: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" msgstr "" -#: tests/genfile.c:821 +#: tests/genfile.c:819 #, c-format msgid "Command terminated\n" msgstr "" -#: tests/genfile.c:853 +#: tests/genfile.c:851 #, fuzzy, c-format msgid "--stat requires file names" msgstr "--損毀的檔案名稱--\n" -#: tests/genfile.c:866 +#: tests/genfile.c:864 #, c-format msgid "too many arguments" msgstr "" @@ -2690,6 +2745,9 @@ msgstr "" #~ msgid "Error in writing to standard output" #~ msgstr "將資料寫入至標準輸出時發生錯誤" +#~ msgid "Error exit delayed from previous errors" +#~ msgstr "發生錯誤離開時因之前的錯誤而延遲" + #~ msgid "Cannot dup" #~ msgstr "dup 程序失敗" diff --git a/rmt/Makefile.in b/rmt/Makefile.in index 45889c5..5478926 100644 --- a/rmt/Makefile.in +++ b/rmt/Makefile.in @@ -42,19 +42,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.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/closeout.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/eoverflow.m4 \ + $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fcntl-safer.m4 \ - $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fileblocks.m4 \ - $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ - $(top_srcdir)/m4/ftruncate.m4 \ + $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ + $(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl_h.m4 \ + $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/float_h.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ + $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getdelim.m4 \ @@ -79,41 +80,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.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/setenv.m4 \ - $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/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/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/sys_stat_h.m4 \ - $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ - $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/sleep.m4 \ + $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ + $(top_srcdir)/m4/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/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/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac @@ -178,7 +181,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EOVERFLOW = @EOVERFLOW@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FCNTL_H = @FCNTL_H@ FLOAT_H = @FLOAT_H@ @@ -188,30 +197,47 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_DIRFD = @GNULIB_DIRFD@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ GNULIB_FTELLO = @GNULIB_FTELLO@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FWRITE = @GNULIB_FWRITE@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ @@ -232,15 +258,26 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ GNULIB_STPCPY = @GNULIB_STPCPY@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ @@ -256,25 +293,35 @@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ATOLL = @HAVE_ATOLL@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ +HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ +HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ @@ -288,22 +335,31 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DUP2 = @HAVE_DUP2@ +HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ +HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ +HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_IO_H = @HAVE_IO_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_R = @HAVE_RANDOM_R@ +HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_RPMATCH = @HAVE_RPMATCH@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -319,10 +375,15 @@ HAVE_STRNDUP = @HAVE_STRNDUP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOLL = @HAVE_STRTOLL@ +HAVE_STRTOULL = @HAVE_STRTOULL@ +HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ +HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ @@ -364,6 +425,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -389,13 +451,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ +PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ REPLACE_CHOWN = @REPLACE_CHOWN@ +REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ +REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -408,18 +473,25 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ +REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRPTIME = @REPLACE_STRPTIME@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ @@ -432,6 +504,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -447,6 +520,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 268cee7..5a72416 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -43,19 +43,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.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/closeout.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/eoverflow.m4 \ + $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fcntl-safer.m4 \ - $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fileblocks.m4 \ - $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ - $(top_srcdir)/m4/ftruncate.m4 \ + $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ + $(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl_h.m4 \ + $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/float_h.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ + $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getdelim.m4 \ @@ -80,41 +81,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.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/setenv.m4 \ - $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/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/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/sys_stat_h.m4 \ - $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ - $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/sleep.m4 \ + $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ + $(top_srcdir)/m4/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/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/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac @@ -166,7 +169,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EOVERFLOW = @EOVERFLOW@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FCNTL_H = @FCNTL_H@ FLOAT_H = @FLOAT_H@ @@ -176,30 +185,47 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_DIRFD = @GNULIB_DIRFD@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ GNULIB_FTELLO = @GNULIB_FTELLO@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FWRITE = @GNULIB_FWRITE@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ @@ -220,15 +246,26 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ GNULIB_STPCPY = @GNULIB_STPCPY@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ @@ -244,25 +281,35 @@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ATOLL = @HAVE_ATOLL@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ +HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ +HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ @@ -276,22 +323,31 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DUP2 = @HAVE_DUP2@ +HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ +HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ +HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_IO_H = @HAVE_IO_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_R = @HAVE_RANDOM_R@ +HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_RPMATCH = @HAVE_RPMATCH@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -307,10 +363,15 @@ HAVE_STRNDUP = @HAVE_STRNDUP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOLL = @HAVE_STRTOLL@ +HAVE_STRTOULL = @HAVE_STRTOULL@ +HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ +HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ @@ -352,6 +413,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -377,13 +439,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ +PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ REPLACE_CHOWN = @REPLACE_CHOWN@ +REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ +REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -396,18 +461,25 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ +REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRPTIME = @REPLACE_STRPTIME@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ @@ -420,6 +492,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -435,6 +508,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ diff --git a/src/Makefile.in b/src/Makefile.in index d97b1c6..66edf30 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -49,19 +49,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.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/closeout.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/eoverflow.m4 \ + $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fcntl-safer.m4 \ - $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fileblocks.m4 \ - $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ - $(top_srcdir)/m4/ftruncate.m4 \ + $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ + $(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl_h.m4 \ + $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/float_h.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ + $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getdelim.m4 \ @@ -86,41 +87,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.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/setenv.m4 \ - $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/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/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/sys_stat_h.m4 \ - $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ - $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/sleep.m4 \ + $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ + $(top_srcdir)/m4/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/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/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac @@ -192,7 +195,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EOVERFLOW = @EOVERFLOW@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FCNTL_H = @FCNTL_H@ FLOAT_H = @FLOAT_H@ @@ -202,30 +211,47 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_DIRFD = @GNULIB_DIRFD@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ GNULIB_FTELLO = @GNULIB_FTELLO@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FWRITE = @GNULIB_FWRITE@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ @@ -246,15 +272,26 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ GNULIB_STPCPY = @GNULIB_STPCPY@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ @@ -270,25 +307,35 @@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ATOLL = @HAVE_ATOLL@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ +HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ +HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ @@ -302,22 +349,31 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DUP2 = @HAVE_DUP2@ +HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ +HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ +HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_IO_H = @HAVE_IO_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_R = @HAVE_RANDOM_R@ +HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_RPMATCH = @HAVE_RPMATCH@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -333,10 +389,15 @@ HAVE_STRNDUP = @HAVE_STRNDUP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOLL = @HAVE_STRTOLL@ +HAVE_STRTOULL = @HAVE_STRTOULL@ +HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ +HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ @@ -378,6 +439,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -403,13 +465,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ +PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ REPLACE_CHOWN = @REPLACE_CHOWN@ +REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ +REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -422,18 +487,25 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ +REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRPTIME = @REPLACE_STRPTIME@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ @@ -446,6 +518,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -461,6 +534,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ diff --git a/src/buffer.c b/src/buffer.c index 8f8b43f..5f5457a 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,7 +1,7 @@ /* Buffer management for tar. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written by John Gilmore, on 1985-08-25. @@ -33,30 +33,30 @@ #include /* Number of retries before giving up on read. */ -#define READ_ERROR_MAX 10 +#define READ_ERROR_MAX 10 /* Globbing pattern to append to volume label if initial match failed. */ #define VOLUME_LABEL_APPEND " Volume [1-9]*" /* Variables. */ -static tarlong prev_written; /* bytes written on previous volumes */ -static tarlong bytes_written; /* bytes written on this volume */ -static void *record_buffer[2]; /* allocated memory */ +static tarlong prev_written; /* bytes written on previous volumes */ +static tarlong bytes_written; /* bytes written on this volume */ +static void *record_buffer[2]; /* allocated memory */ union block *record_buffer_aligned[2]; static int record_index; /* FIXME: The following variables should ideally be static to this module. However, this cannot be done yet. The cleanup continues! */ -union block *record_start; /* start of record of archive */ -union block *record_end; /* last+1 block of archive record */ -union block *current_block; /* current block of archive */ -enum access_mode access_mode; /* how do we handle the archive */ -off_t records_read; /* number of records read from this archive */ -off_t records_written; /* likewise, for records written */ +union block *record_start; /* start of record of archive */ +union block *record_end; /* last+1 block of archive record */ +union block *current_block; /* current block of archive */ +enum access_mode access_mode; /* how do we handle the archive */ +off_t records_read; /* number of records read from this archive */ +off_t records_written; /* likewise, for records written */ extern off_t records_skipped; /* number of records skipped at the start - of the archive, defined in delete.c */ + of the archive, defined in delete.c */ static off_t record_start_block; /* block ordinal at record_start */ @@ -96,10 +96,10 @@ uintmax_t continued_file_size; uintmax_t continued_file_offset; -static int volno = 1; /* which volume of a multi-volume tape we're - on */ -static int global_volno = 1; /* volume number to print in external - messages */ +static int volno = 1; /* which volume of a multi-volume tape we're + on */ +static int global_volno = 1; /* volume number to print in external + messages */ bool write_archive_to_stdout; @@ -111,11 +111,11 @@ static off_t real_s_sizeleft; /* Multi-volume tracking support */ -static char *save_name; /* name of the file we are currently writing */ -static off_t save_totsize; /* total size of file we are writing, only - valid if save_name is nonzero */ -static off_t save_sizeleft; /* where we are in the file we are writing, - only valid if save_name is nonzero */ +static char *save_name; /* name of the file we are currently writing */ +static off_t save_totsize; /* total size of file we are writing, only + valid if save_name is nonzero */ +static off_t save_sizeleft; /* where we are in the file we are writing, + only valid if save_name is nonzero */ static struct tar_stat_info dummy; @@ -190,7 +190,7 @@ compute_duration () struct timespec now; gettime (&now); duration += ((now.tv_sec - last_stat_time.tv_sec) - + (now.tv_nsec - last_stat_time.tv_nsec) / 1e9); + + (now.tv_nsec - last_stat_time.tv_nsec) / 1e9); gettime (&last_stat_time); } @@ -198,11 +198,13 @@ compute_duration () /* Compression detection */ enum compress_type { - ct_none, + ct_tar, /* Plain tar file */ + ct_none, /* Unknown compression type */ ct_compress, ct_gzip, ct_bzip2, - ct_lzma + ct_lzma, + ct_lzop }; struct zip_magic @@ -215,11 +217,13 @@ struct zip_magic }; static struct zip_magic const magic[] = { + { ct_tar }, { ct_none, }, { ct_compress, 2, "\037\235", "compress", "-Z" }, { ct_gzip, 2, "\037\213", "gzip", "-z" }, { ct_bzip2, 3, "BZh", "bzip2", "-j" }, - { ct_lzma, 6, "\xFFLZMA", "lzma", "--lzma" }, /* FIXME: ???? */ + { ct_lzma, 6, "\xFFLZMA", "lzma", "-J" }, /* FIXME: ???? */ + { ct_lzop, 4, "\211LZO", "lzop", "--lzop" }, }; #define NMAGIC (sizeof(magic)/sizeof(magic[0])) @@ -242,7 +246,7 @@ check_compressed_archive (bool *pshort) record_end = record_start; /* set up for 1st record = # 0 */ sfr = read_full_records; read_full_records = true; /* Suppress fatal error on reading a partial - record */ + record */ *pshort = find_next_block () == 0; /* Restore global values */ @@ -250,9 +254,9 @@ check_compressed_archive (bool *pshort) if (tar_checksum (record_start, true) == HEADER_SUCCESS) /* Probably a valid header */ - return ct_none; + return ct_tar; - for (p = magic + 1; p < magic + NMAGIC; p++) + for (p = magic + 2; p < magic + NMAGIC; p++) if (memcmp (record_start->buffer, p->magic, p->length) == 0) return p->type; @@ -266,30 +270,45 @@ int open_compressed_archive () { archive = rmtopen (archive_name_array[0], O_RDONLY | O_BINARY, - MODE_RW, rsh_command_option); + MODE_RW, rsh_command_option); if (archive == -1) return archive; if (!multi_volume_option) { - bool shortfile; - enum compress_type type = check_compressed_archive (&shortfile); - - if (type == ct_none) - { - if (shortfile) - ERROR ((0, 0, _("This does not look like a tar archive"))); - return archive; - } + if (!use_compress_program_option) + { + bool shortfile; + enum compress_type type = check_compressed_archive (&shortfile); + + switch (type) + { + case ct_tar: + if (shortfile) + ERROR ((0, 0, _("This does not look like a tar archive"))); + return archive; + + case ct_none: + if (shortfile) + ERROR ((0, 0, _("This does not look like a tar archive"))); + set_comression_program_by_suffix (archive_name_array[0], NULL); + if (!use_compress_program_option) + return archive; + break; + + default: + use_compress_program_option = compress_program (type); + break; + } + } /* FD is not needed any more */ rmtclose (archive); hit_eof = false; /* It might have been set by find_next_block in - check_compressed_archive */ + check_compressed_archive */ /* Open compressed archive */ - use_compress_program_option = compress_program (type); child_pid = sys_child_open_for_uncompress (); read_full_records = true; } @@ -313,11 +332,11 @@ print_stats (FILE *fp, const char *text, tarlong numbytes) 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) - : "?")); + 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) + : "?")); } void @@ -331,20 +350,20 @@ print_total_stats () 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); + 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)); + 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)); } break; @@ -352,7 +371,7 @@ print_total_stats () case LIST_SUBCOMMAND: case DIFF_SUBCOMMAND: print_stats (stderr, _("Total bytes read"), - records_read * record_size); + records_read * record_size); break; default: @@ -389,13 +408,13 @@ find_next_block (void) if (current_block == record_end) { if (hit_eof) - return 0; + return 0; flush_archive (); if (current_block == record_end) - { - hit_eof = true; - return 0; - } + { + hit_eof = true; + return 0; + } } return current_block; } @@ -475,96 +494,103 @@ _open_archive (enum access_mode wanted_access) if (use_compress_program_option) { switch (wanted_access) - { - case ACCESS_READ: - child_pid = sys_child_open_for_uncompress (); - read_full_records = true; - record_end = record_start; /* set up for 1st record = # 0 */ - break; - - case ACCESS_WRITE: - child_pid = sys_child_open_for_compress (); - break; - - case ACCESS_UPDATE: - abort (); /* Should not happen */ - break; - } + { + case ACCESS_READ: + child_pid = sys_child_open_for_uncompress (); + read_full_records = true; + record_end = record_start; /* set up for 1st record = # 0 */ + break; + + case ACCESS_WRITE: + child_pid = sys_child_open_for_compress (); + break; + + case ACCESS_UPDATE: + abort (); /* Should not happen */ + break; + } if (!index_file_name - && wanted_access == ACCESS_WRITE - && strcmp (archive_name_array[0], "-") == 0) - stdlis = stderr; + && wanted_access == ACCESS_WRITE + && strcmp (archive_name_array[0], "-") == 0) + stdlis = stderr; } else if (strcmp (archive_name_array[0], "-") == 0) { read_full_records = true; /* could be a pipe, be safe */ if (verify_option) - FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive"))); + FATAL_ERROR ((0, 0, _("Cannot verify stdin/stdout archive"))); switch (wanted_access) - { - case ACCESS_READ: - { - bool shortfile; - enum compress_type type; - - archive = STDIN_FILENO; - - type = check_compressed_archive (&shortfile); - if (type != ct_none) - FATAL_ERROR ((0, 0, - _("Archive is compressed. Use %s option"), - compress_option (type))); - if (shortfile) - ERROR ((0, 0, _("This does not look like a tar archive"))); - } - break; - - case ACCESS_WRITE: - archive = STDOUT_FILENO; - if (!index_file_name) - stdlis = stderr; - break; - - case ACCESS_UPDATE: - archive = STDIN_FILENO; - write_archive_to_stdout = true; - record_end = record_start; /* set up for 1st record = # 0 */ - if (!index_file_name) - stdlis = stderr; - break; - } + { + case ACCESS_READ: + { + bool shortfile; + enum compress_type type; + + archive = STDIN_FILENO; + + type = check_compressed_archive (&shortfile); + if (type != ct_tar && type != ct_none) + FATAL_ERROR ((0, 0, + _("Archive is compressed. Use %s option"), + compress_option (type))); + if (shortfile) + ERROR ((0, 0, _("This does not look like a tar archive"))); + } + break; + + case ACCESS_WRITE: + archive = STDOUT_FILENO; + if (!index_file_name) + stdlis = stderr; + break; + + case ACCESS_UPDATE: + archive = STDIN_FILENO; + write_archive_to_stdout = true; + record_end = record_start; /* set up for 1st record = # 0 */ + if (!index_file_name) + stdlis = stderr; + break; + } } else if (verify_option) archive = rmtopen (archive_name_array[0], O_RDWR | O_CREAT | O_BINARY, - MODE_RW, rsh_command_option); + MODE_RW, rsh_command_option); else switch (wanted_access) { case ACCESS_READ: - archive = open_compressed_archive (); - break; + archive = open_compressed_archive (); + break; case ACCESS_WRITE: - if (backup_option) - { - maybe_backup_file (archive_name_array[0], 1); - backed_up_flag = 1; - } - archive = rmtcreat (archive_name_array[0], MODE_RW, - rsh_command_option); - break; + if (backup_option) + { + maybe_backup_file (archive_name_array[0], 1); + backed_up_flag = 1; + } + archive = rmtcreat (archive_name_array[0], MODE_RW, + rsh_command_option); + break; case ACCESS_UPDATE: - archive = rmtopen (archive_name_array[0], - O_RDWR | O_CREAT | O_BINARY, - MODE_RW, rsh_command_option); - - if (check_compressed_archive (NULL) != ct_none) - FATAL_ERROR ((0, 0, - _("Cannot update compressed archives"))); - break; + archive = rmtopen (archive_name_array[0], + O_RDWR | O_CREAT | O_BINARY, + MODE_RW, rsh_command_option); + + switch (check_compressed_archive (NULL)) + { + case ct_none: + case ct_tar: + break; + + default: + FATAL_ERROR ((0, 0, + _("Cannot update compressed archives"))); + } + break; } if (archive < 0 @@ -573,7 +599,7 @@ _open_archive (enum access_mode wanted_access) int saved_errno = errno; if (backed_up_flag) - undo_last_backup (); + undo_last_backup (); errno = saved_errno; open_fatal (archive_name_array[0]); } @@ -585,7 +611,7 @@ _open_archive (enum access_mode wanted_access) switch (wanted_access) { case ACCESS_READ: - find_next_block (); /* read it in, check for EOF */ + find_next_block (); /* read it in, check for EOF */ break; case ACCESS_UPDATE: @@ -654,53 +680,49 @@ archive_read_error (void) static void short_read (size_t status) { - size_t left; /* bytes left */ - char *more; /* pointer to next byte to read */ + size_t left; /* bytes left */ + char *more; /* pointer to next byte to read */ more = record_start->buffer + status; left = record_size - status; + if (left && left % BLOCKSIZE == 0 + && verbose_option + && record_start_block == 0 && status != 0) + { + unsigned long rsize = status / BLOCKSIZE; + WARN ((0, 0, + ngettext ("Record size = %lu block", + "Record size = %lu blocks", + rsize), + rsize)); + } + while (left % BLOCKSIZE != 0 - || (left && status && read_full_records)) + || (left && status && read_full_records)) { if (status) - while ((status = rmtread (archive, more, left)) == SAFE_READ_ERROR) - archive_read_error (); + while ((status = rmtread (archive, more, left)) == SAFE_READ_ERROR) + archive_read_error (); if (status == 0) - break; + break; if (! read_full_records) - { - unsigned long rest = record_size - left; + { + unsigned long rest = record_size - left; - FATAL_ERROR ((0, 0, - ngettext ("Unaligned block (%lu byte) in archive", - "Unaligned block (%lu bytes) in archive", - rest), - rest)); - } - - /* User warned us about this. Fix up. */ + FATAL_ERROR ((0, 0, + ngettext ("Unaligned block (%lu byte) in archive", + "Unaligned block (%lu bytes) in archive", + rest), + rest)); + } left -= status; more += status; } - /* FIXME: for size=0, multi-volume support. On the first record, warn - about the problem. */ - - if (!read_full_records && verbose_option > 1 - && record_start_block == 0 && status != 0) - { - unsigned long rsize = (record_size - left) / BLOCKSIZE; - WARN ((0, 0, - ngettext ("Record size = %lu block", - "Record size = %lu blocks", - rsize), - rsize)); - } - record_end = record_start + (record_size - left) / BLOCKSIZE; records_read++; } @@ -765,16 +787,16 @@ backspace_output (void) position = 0; if (rmtlseek (archive, position, SEEK_SET) != position) { - /* Lseek failed. Try a different method. */ + /* Lseek failed. Try a different method. */ - WARN ((0, 0, - _("Cannot backspace archive file; it may be unreadable without -i"))); + WARN ((0, 0, + _("Cannot backspace archive file; it may be unreadable without -i"))); - /* Replace the first part of the record with NULs. */ + /* Replace the first part of the record with NULs. */ - if (record_start->buffer != output_start) - memset (record_start->buffer, 0, - output_start - record_start->buffer); + if (record_start->buffer != output_start) + memset (record_start->buffer, 0, + output_start - record_start->buffer); } } } @@ -823,11 +845,9 @@ close_archive (void) { flush_archive (); if (current_block > record_start) - flush_archive (); + flush_archive (); } - sys_drain_input_pipe (); - compute_duration (); if (verify_option) verify_volume (); @@ -835,7 +855,7 @@ close_archive (void) if (rmtclose (archive) != 0) close_error (*archive_name_cursor); - sys_wait_for_child (child_pid); + sys_wait_for_child (child_pid, hit_eof); tar_stat_destroy (¤t_stat_info); if (save_name) @@ -855,13 +875,13 @@ init_volume_number (void) if (file) { if (fscanf (file, "%d", &global_volno) != 1 - || global_volno < 0) - FATAL_ERROR ((0, 0, _("%s: contains invalid volume number"), - quotearg_colon (volno_file_option))); + || global_volno < 0) + FATAL_ERROR ((0, 0, _("%s: contains invalid volume number"), + quotearg_colon (volno_file_option))); if (ferror (file)) - read_error (volno_file_option); + read_error (volno_file_option); if (fclose (file) != 0) - close_error (volno_file_option); + close_error (volno_file_option); } else if (errno != ENOENT) open_error (volno_file_option); @@ -877,9 +897,9 @@ closeout_volume_number (void) { fprintf (file, "%d\n", global_volno); if (ferror (file)) - write_error (volno_file_option); + write_error (volno_file_option); if (fclose (file) != 0) - close_error (volno_file_option); + close_error (volno_file_option); } else open_error (volno_file_option); @@ -906,92 +926,92 @@ change_tape_menu (FILE *read_file) { fputc ('\007', stderr); fprintf (stderr, - _("Prepare volume #%d for %s and hit return: "), - global_volno + 1, quote (*archive_name_cursor)); + _("Prepare volume #%d for %s and hit return: "), + global_volno + 1, quote (*archive_name_cursor)); fflush (stderr); if (getline (&input_buffer, &size, read_file) <= 0) - { - WARN ((0, 0, _("EOF where user reply was expected"))); + { + WARN ((0, 0, _("EOF where user reply was expected"))); - if (subcommand_option != EXTRACT_SUBCOMMAND - && subcommand_option != LIST_SUBCOMMAND - && subcommand_option != DIFF_SUBCOMMAND) - WARN ((0, 0, _("WARNING: Archive is incomplete"))); + if (subcommand_option != EXTRACT_SUBCOMMAND + && subcommand_option != LIST_SUBCOMMAND + && subcommand_option != DIFF_SUBCOMMAND) + WARN ((0, 0, _("WARNING: Archive is incomplete"))); - fatal_exit (); - } + fatal_exit (); + } if (input_buffer[0] == '\n' - || input_buffer[0] == 'y' - || input_buffer[0] == 'Y') - break; + || input_buffer[0] == 'y' + || input_buffer[0] == 'Y') + break; switch (input_buffer[0]) - { - case '?': - { - fprintf (stderr, _("\ + { + case '?': + { + fprintf (stderr, _("\ 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")); if (!restrict_option) fprintf (stderr, _(" ! Spawn a subshell\n")); - fprintf (stderr, _(" ? Print this list\n")); - } - break; - - case 'q': - /* Quit. */ - - WARN ((0, 0, _("No new volume; exiting.\n"))); - - if (subcommand_option != EXTRACT_SUBCOMMAND - && subcommand_option != LIST_SUBCOMMAND - && subcommand_option != DIFF_SUBCOMMAND) - WARN ((0, 0, _("WARNING: Archive is incomplete"))); - - fatal_exit (); - - case 'n': - /* Get new file name. */ - - { - char *name; - char *cursor; - - for (name = input_buffer + 1; - *name == ' ' || *name == '\t'; - name++) - ; - - for (cursor = name; *cursor && *cursor != '\n'; cursor++) - ; - *cursor = '\0'; - - if (name[0]) - { - /* FIXME: the following allocation is never reclaimed. */ - *archive_name_cursor = xstrdup (name); - stop = true; - } - else - fprintf (stderr, "%s", - _("File name not specified. Try again.\n")); - } - break; - - case '!': - if (!restrict_option) - { - sys_spawn_shell (); - break; - } - /* FALL THROUGH */ - - default: - fprintf (stderr, _("Invalid input. Type ? for help.\n")); - } + fprintf (stderr, _(" ? Print this list\n")); + } + break; + + case 'q': + /* Quit. */ + + WARN ((0, 0, _("No new volume; exiting.\n"))); + + if (subcommand_option != EXTRACT_SUBCOMMAND + && subcommand_option != LIST_SUBCOMMAND + && subcommand_option != DIFF_SUBCOMMAND) + WARN ((0, 0, _("WARNING: Archive is incomplete"))); + + fatal_exit (); + + case 'n': + /* Get new file name. */ + + { + char *name; + char *cursor; + + for (name = input_buffer + 1; + *name == ' ' || *name == '\t'; + name++) + ; + + for (cursor = name; *cursor && *cursor != '\n'; cursor++) + ; + *cursor = '\0'; + + if (name[0]) + { + /* FIXME: the following allocation is never reclaimed. */ + *archive_name_cursor = xstrdup (name); + stop = true; + } + else + fprintf (stderr, "%s", + _("File name not specified. Try again.\n")); + } + break; + + case '!': + if (!restrict_option) + { + sys_spawn_shell (); + break; + } + /* FALL THROUGH */ + + default: + fprintf (stderr, _("Invalid input. Type ? for help.\n")); + } } free (input_buffer); } @@ -1037,15 +1057,15 @@ new_volume (enum access_mode mode) /* We have to prompt from now on. */ if (info_script_option) - { - if (volno_file_option) - closeout_volume_number (); - if (sys_exec_info_script (archive_name_cursor, global_volno+1)) - FATAL_ERROR ((0, 0, _("%s command failed"), - quote (info_script_option))); - } + { + if (volno_file_option) + closeout_volume_number (); + if (sys_exec_info_script (archive_name_cursor, global_volno+1)) + FATAL_ERROR ((0, 0, _("%s command failed"), + quote (info_script_option))); + } else - change_tape_menu (read_file); + change_tape_menu (read_file); } if (strcmp (archive_name_cursor[0], "-") == 0) @@ -1055,33 +1075,33 @@ new_volume (enum access_mode mode) } else if (verify_option) archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW, - rsh_command_option); + rsh_command_option); else switch (mode) { case ACCESS_READ: - archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW, - rsh_command_option); - break; + archive = rmtopen (*archive_name_cursor, O_RDONLY, MODE_RW, + rsh_command_option); + break; case ACCESS_WRITE: - if (backup_option) - maybe_backup_file (*archive_name_cursor, 1); - archive = rmtcreat (*archive_name_cursor, MODE_RW, - rsh_command_option); - break; + if (backup_option) + maybe_backup_file (*archive_name_cursor, 1); + archive = rmtcreat (*archive_name_cursor, MODE_RW, + rsh_command_option); + break; case ACCESS_UPDATE: - archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW, - rsh_command_option); - break; + archive = rmtopen (*archive_name_cursor, O_RDWR | O_CREAT, MODE_RW, + rsh_command_option); + break; } if (archive < 0) { open_warn (*archive_name_cursor); if (!verify_option && mode == ACCESS_WRITE && backup_option) - undo_last_backup (); + undo_last_backup (); prompt = 1; goto tryagain; } @@ -1131,7 +1151,7 @@ try_new_volume () return true; while ((status = rmtread (archive, record_start->buffer, record_size)) - == SAFE_READ_ERROR) + == SAFE_READ_ERROR) archive_read_error (); if (status != record_size) @@ -1145,40 +1165,40 @@ try_new_volume () { case XGLTYPE: { - if (!read_header0 (&dummy)) - return false; - xheader_decode (&dummy); /* decodes values from the global header */ - tar_stat_destroy (&dummy); - if (!real_s_name) - { - /* We have read the extended header of the first member in - this volume. Put it back, so next read_header works as - expected. */ - current_block = record_start; - } - break; + if (!read_header0 (&dummy)) + return false; + xheader_decode (&dummy); /* decodes values from the global header */ + tar_stat_destroy (&dummy); + if (!real_s_name) + { + /* We have read the extended header of the first member in + this volume. Put it back, so next read_header works as + expected. */ + current_block = record_start; + } + break; } case GNUTYPE_VOLHDR: if (!read_header0 (&dummy)) - return false; + return false; tar_stat_destroy (&dummy); assign_string (&volume_label, current_header->header.name); set_next_block_after (header); header = find_next_block (); if (header->header.typeflag != GNUTYPE_MULTIVOL) - break; + break; /* FALL THROUGH */ case GNUTYPE_MULTIVOL: if (!read_header0 (&dummy)) - return false; + return false; tar_stat_destroy (&dummy); assign_string (&continued_file_name, current_header->header.name); continued_file_size = - UINTMAX_FROM_HEADER (current_header->header.size); + UINTMAX_FROM_HEADER (current_header->header.size); continued_file_offset = - UINTMAX_FROM_HEADER (current_header->oldgnu_header.offset); + UINTMAX_FROM_HEADER (current_header->oldgnu_header.offset); break; default: @@ -1189,44 +1209,52 @@ try_new_volume () { uintmax_t s; if (!continued_file_name - || strcmp (continued_file_name, real_s_name)) - { - if ((archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT) - && strlen (real_s_name) >= NAME_FIELD_SIZE - && strncmp (continued_file_name, real_s_name, - NAME_FIELD_SIZE) == 0) - WARN ((0, 0, + || strcmp (continued_file_name, real_s_name)) + { + if ((archive_format == GNU_FORMAT || archive_format == OLDGNU_FORMAT) + && strlen (real_s_name) >= NAME_FIELD_SIZE + && strncmp (continued_file_name, real_s_name, + NAME_FIELD_SIZE) == 0) + WARN ((0, 0, _("%s is possibly continued on this volume: header contains truncated name"), - quote (real_s_name))); - else - { - WARN ((0, 0, _("%s is not continued on this volume"), - quote (real_s_name))); - return false; - } - } + quote (real_s_name))); + else + { + WARN ((0, 0, _("%s is not continued on this volume"), + quote (real_s_name))); + return false; + } + } s = continued_file_size + continued_file_offset; if (real_s_totsize != s || s < continued_file_offset) - { - char totsizebuf[UINTMAX_STRSIZE_BOUND]; - char s1buf[UINTMAX_STRSIZE_BOUND]; - char s2buf[UINTMAX_STRSIZE_BOUND]; - - WARN ((0, 0, _("%s is the wrong size (%s != %s + %s)"), - quote (continued_file_name), - STRINGIFY_BIGINT (save_totsize, totsizebuf), - STRINGIFY_BIGINT (continued_file_size, s1buf), - STRINGIFY_BIGINT (continued_file_offset, s2buf))); - return false; - } + { + char totsizebuf[UINTMAX_STRSIZE_BOUND]; + char s1buf[UINTMAX_STRSIZE_BOUND]; + char s2buf[UINTMAX_STRSIZE_BOUND]; + + WARN ((0, 0, _("%s is the wrong size (%s != %s + %s)"), + quote (continued_file_name), + STRINGIFY_BIGINT (save_totsize, totsizebuf), + STRINGIFY_BIGINT (continued_file_size, s1buf), + STRINGIFY_BIGINT (continued_file_offset, s2buf))); + return false; + } if (real_s_totsize - real_s_sizeleft != continued_file_offset) - { - WARN ((0, 0, _("This volume is out of sequence"))); - return false; - } + { + char totsizebuf[UINTMAX_STRSIZE_BOUND]; + char s1buf[UINTMAX_STRSIZE_BOUND]; + char s2buf[UINTMAX_STRSIZE_BOUND]; + + WARN ((0, 0, _("This volume is out of sequence (%s - %s != %s)"), + STRINGIFY_BIGINT (real_s_totsize, totsizebuf), + STRINGIFY_BIGINT (real_s_sizeleft, s1buf), + STRINGIFY_BIGINT (continued_file_offset, s2buf))); + + return false; + } } increase_volume_number (); @@ -1254,7 +1282,7 @@ check_label_pattern (union block *label) return false; string = xmalloc (strlen (volume_label_option) - + sizeof VOLUME_LABEL_APPEND + 1); + + sizeof VOLUME_LABEL_APPEND + 1); strcpy (string, volume_label_option); strcat (string, VOLUME_LABEL_APPEND); result = fnmatch (string, label->header.name, 0) == 0; @@ -1271,11 +1299,11 @@ match_volume_label (void) if (!label) FATAL_ERROR ((0, 0, _("Archive not labeled to match %s"), - quote (volume_label_option))); + quote (volume_label_option))); if (!check_label_pattern (label)) FATAL_ERROR ((0, 0, _("Volume %s does not match %s"), - quote_n (0, label->header.name), - quote_n (1, volume_label_option))); + quote_n (0, label->header.name), + quote_n (1, volume_label_option))); } /* Mark the archive with volume label STR. */ @@ -1290,11 +1318,11 @@ _write_volume_label (const char *str) memset (label, 0, BLOCKSIZE); - strcpy (label->header.name, volume_label_option); + strcpy (label->header.name, str); assign_string (¤t_stat_info.file_name, - label->header.name); + label->header.name); current_stat_info.had_trailing_slash = - strip_trailing_slashes (current_stat_info.file_name); + strip_trailing_slashes (current_stat_info.file_name); label->header.typeflag = GNUTYPE_VOLHDR; TIME_TO_CHARS (start_time.tv_sec, label->header.mtime); @@ -1312,7 +1340,7 @@ add_volume_label (void) char buf[UINTMAX_STRSIZE_BOUND]; char *p = STRINGIFY_BIGINT (volno, buf); char *s = xmalloc (strlen (volume_label_option) + sizeof VOL_SUFFIX - + strlen (p) + 2); + + strlen (p) + 2); sprintf (s, "%s %s %s", volume_label_option, VOL_SUFFIX, p); _write_volume_label (s); free (s); @@ -1335,15 +1363,15 @@ add_chunk_header () st.stat.st_uid = getuid (); st.stat.st_gid = getgid (); st.orig_file_name = xheader_format_name (&st, - "%d/GNUFileParts.%p/%f.%n", - real_s_part_no); + "%d/GNUFileParts.%p/%f.%n", + real_s_part_no); st.file_name = st.orig_file_name; st.archive_file_size = st.stat.st_size = real_s_sizeleft; block_ordinal = current_block_ordinal (); blk = start_header (&st); if (!blk) - abort (); /* FIXME */ + abort (); /* FIXME */ finish_header (&st, blk, block_ordinal); free (st.orig_file_name); } @@ -1369,8 +1397,8 @@ gnu_add_multi_volume_header (void) if (strlen (real_s_name) > NAME_FIELD_SIZE) WARN ((0, 0, - _("%s: file name too long to be stored in a GNU multivolume header, truncated"), - quotearg_colon (real_s_name))); + _("%s: file name too long to be stored in a GNU multivolume header, truncated"), + quotearg_colon (real_s_name))); memset (block, 0, BLOCKSIZE); @@ -1383,7 +1411,7 @@ gnu_add_multi_volume_header (void) OFF_TO_CHARS (real_s_sizeleft, block->header.size); OFF_TO_CHARS (real_s_totsize - real_s_sizeleft, - block->oldgnu_header.offset); + block->oldgnu_header.offset); tmp = verbose_option; verbose_option = 0; @@ -1415,19 +1443,19 @@ multi_volume_sync () if (multi_volume_option) { if (save_name) - { - assign_string (&real_s_name, - safer_name_suffix (save_name, false, - absolute_names_option)); - real_s_totsize = save_totsize; - real_s_sizeleft = save_sizeleft; - } + { + assign_string (&real_s_name, + safer_name_suffix (save_name, false, + absolute_names_option)); + real_s_totsize = save_totsize; + real_s_sizeleft = save_sizeleft; + } else - { - assign_string (&real_s_name, 0); - real_s_totsize = 0; - real_s_sizeleft = 0; - } + { + assign_string (&real_s_name, 0); + real_s_totsize = 0; + real_s_sizeleft = 0; + } } } @@ -1438,14 +1466,14 @@ multi_volume_sync () static void simple_flush_read (void) { - size_t status; /* result from system call */ + size_t status; /* result from system call */ checkpoint_run (false); /* Clear the count of errors. This only applies to a single call to flush_read. */ - read_error_count = 0; /* clear error count */ + read_error_count = 0; /* clear error count */ if (write_archive_to_stdout && record_start_block != 0) { @@ -1453,22 +1481,22 @@ simple_flush_read (void) status = sys_write_archive_buffer (); archive = STDIN_FILENO; if (status != record_size) - archive_write_error (status); + archive_write_error (status); } for (;;) { status = rmtread (archive, record_start->buffer, record_size); if (status == record_size) - { - records_read++; - return; - } + { + records_read++; + return; + } if (status == SAFE_READ_ERROR) - { - archive_read_error (); - continue; /* try again */ - } + { + archive_read_error (); + continue; /* try again */ + } break; } short_read (status); @@ -1497,14 +1525,14 @@ simple_flush_write (size_t level __attribute__((unused))) static void _gnu_flush_read (void) { - size_t status; /* result from system call */ + size_t status; /* result from system call */ checkpoint_run (false); /* Clear the count of errors. This only applies to a single call to flush_read. */ - read_error_count = 0; /* clear error count */ + read_error_count = 0; /* clear error count */ if (write_archive_to_stdout && record_start_block != 0) { @@ -1512,7 +1540,7 @@ _gnu_flush_read (void) status = sys_write_archive_buffer (); archive = STDIN_FILENO; if (status != record_size) - archive_write_error (status); + archive_write_error (status); } multi_volume_sync (); @@ -1521,29 +1549,32 @@ _gnu_flush_read (void) { status = rmtread (archive, record_start->buffer, record_size); if (status == record_size) - { - records_read++; - return; - } + { + records_read++; + return; + } /* The condition below used to include - || (status > 0 && !read_full_records) - This is incorrect since even if new_volume() succeeds, the - subsequent call to rmtread will overwrite the chunk of data - already read in the buffer, so the processing will fail */ + || (status > 0 && !read_full_records) + This is incorrect since even if new_volume() succeeds, the + subsequent call to rmtread will overwrite the chunk of data + already read in the buffer, so the processing will fail */ if ((status == 0 - || (status == SAFE_READ_ERROR && errno == ENOSPC)) - && multi_volume_option) - { - while (!try_new_volume ()) - ; - return; - } + || (status == SAFE_READ_ERROR && errno == ENOSPC)) + && multi_volume_option) + { + while (!try_new_volume ()) + ; + if (current_block == record_end) + /* Necessary for blocking_factor == 1 */ + flush_archive(); + return; + } else if (status == SAFE_READ_ERROR) - { - archive_read_error (); - continue; - } + { + archive_read_error (); + continue; + } break; } short_read (status); @@ -1565,13 +1596,15 @@ _gnu_flush_write (size_t buffer_level) char *copy_ptr; size_t copy_size; size_t bufsize; - + tarlong wrt; + status = _flush_write (); if (status != record_size && !multi_volume_option) archive_write_error (status); else { - records_written++; + if (status) + records_written++; bytes_written += status; } @@ -1581,11 +1614,18 @@ _gnu_flush_write (size_t buffer_level) return; } + if (status % BLOCKSIZE) + { + ERROR ((0, 0, _("write did not end on a block boundary"))); + archive_write_error (status); + } + /* In multi-volume mode. */ /* ENXIO is for the UNIX PC. */ if (status < 0 && errno != ENOSPC && errno != EIO && errno != ENXIO) archive_write_error (status); + real_s_sizeleft -= status; if (!new_volume (ACCESS_WRITE)) return; @@ -1597,6 +1637,7 @@ _gnu_flush_write (size_t buffer_level) copy_ptr = record_start->buffer + status; copy_size = buffer_level - status; + /* Switch to the next buffer */ record_index = !record_index; init_buffer (); @@ -1612,6 +1653,7 @@ _gnu_flush_write (size_t buffer_level) if (real_s_name) add_chunk_header (); + wrt = bytes_written; header = find_next_block (); bufsize = available_space_after (header); while (bufsize < copy_size) @@ -1626,6 +1668,16 @@ _gnu_flush_write (size_t buffer_level) memcpy (header->buffer, copy_ptr, copy_size); memset (header->buffer + copy_size, 0, bufsize - copy_size); set_next_block_after (header + (copy_size - 1) / BLOCKSIZE); + if (multi_volume_option && wrt < bytes_written) + { + /* The value of bytes_written has changed while moving data; + that means that flush_archive was executed at least once in + between, and, as a consequence, copy_size bytes were not written + to disk. We need to update sizeleft variables to compensate for + that. */ + save_sizeleft += copy_size; + multi_volume_sync (); + } find_next_block (); } @@ -1660,13 +1712,13 @@ open_archive (enum access_mode wanted_access) { case ACCESS_READ: if (volume_label_option) - match_volume_label (); + match_volume_label (); break; case ACCESS_WRITE: records_written = 0; if (volume_label_option) - write_volume_label (); + write_volume_label (); break; default: diff --git a/src/checkpoint.c b/src/checkpoint.c index cde5e59..9f031f7 100644 --- a/src/checkpoint.c +++ b/src/checkpoint.c @@ -80,7 +80,7 @@ checkpoint_compile_action (const char *str) if (strcmp (str, ".") == 0 || strcmp (str, "dot") == 0) alloc_action (cop_dot); - if (strcmp (str, "bell") == 0) + else if (strcmp (str, "bell") == 0) alloc_action (cop_bell); else if (strcmp (str, "echo") == 0) alloc_action (cop_echo); diff --git a/src/common.h b/src/common.h index f43673b..9897b46 100644 --- a/src/common.h +++ b/src/common.h @@ -93,9 +93,6 @@ GLOBAL enum subcommand subcommand_option; /* Selected format for output archive. */ GLOBAL enum archive_format archive_format; -/* Either NL or NUL, as decided by the --null option. */ -GLOBAL char filename_terminator; - /* Size of each record, once in blocks, once in bytes. Those two variables are always related, the second being BLOCKSIZE times the first. They do not have _option in their name, even if their values is derived from @@ -702,8 +699,7 @@ char *xheader_format_name (struct tar_stat_info *st, const char *fmt, void sys_detect_dev_null_output (void); void sys_save_archive_dev_ino (void); -void sys_drain_input_pipe (void); -void sys_wait_for_child (pid_t); +void sys_wait_for_child (pid_t, bool); void sys_spawn_shell (void); bool sys_compare_uid (struct stat *a, struct stat *b); bool sys_compare_gid (struct stat *a, struct stat *b); @@ -738,17 +734,16 @@ bool string_ascii_p (const char *str); bool utf8_convert (bool to_utf, char const *input, char **output); /* Module transform.c */ -typedef enum - { - xform_regfile, - xform_link, - xform_symlink - } xform_type; +#define XFORM_REGFILE 0x01 +#define XFORM_LINK 0x02 +#define XFORM_SYMLINK 0x04 +#define XFORM_ALL (XFORM_REGFILE|XFORM_LINK|XFORM_SYMLINK) void set_transform_expr (const char *expr); -bool transform_name (char **pinput); -bool transform_member_name (char **pinput, xform_type type); -bool transform_name_fp (char **pinput, char *(*fun)(char *, void *), void *); +bool transform_name (char **pinput, int type); +bool transform_member_name (char **pinput, int type); +bool transform_name_fp (char **pinput, int type, + char *(*fun)(char *, void *), void *); /* Module suffix.c */ void set_comression_program_by_suffix (const char *name, const char *defprog); diff --git a/src/create.c b/src/create.c index 413115c..a925160 100644 --- a/src/create.c +++ b/src/create.c @@ -1041,7 +1041,7 @@ dump_regular_file (int fd, struct tar_stat_info *st) while (size_left > 0) { size_t bufsize, count; - + mv_size_left (size_left); blk = find_next_block (); @@ -1495,7 +1495,7 @@ dump_file0 (struct tar_stat_info *st, const char *p, assign_string (&st->file_name, safer_name_suffix (p, false, absolute_names_option)); - transform_name (&st->file_name); + transform_name (&st->file_name, XFORM_REGFILE); if (deref_stat (dereference_option, p, &st->stat) != 0) { @@ -1705,7 +1705,7 @@ dump_file0 (struct tar_stat_info *st, const char *p, } buffer[size] = '\0'; assign_string (&st->link_name, buffer); - transform_name (&st->link_name); + transform_name (&st->link_name, XFORM_SYMLINK); if (NAME_FIELD_SIZE - (archive_format == OLDGNU_FORMAT) < size) write_long_link (st); diff --git a/src/extract.c b/src/extract.c index 0d938e6..6d70398 100644 --- a/src/extract.c +++ b/src/extract.c @@ -917,7 +917,6 @@ extract_link (char *file_name, int typeflag) int interdir_made = 0; char const *link_name; - transform_member_name (¤t_stat_info.link_name, xform_link); link_name = current_stat_info.link_name; if (! absolute_names_option && contains_dot_dot (link_name)) @@ -974,8 +973,6 @@ extract_symlink (char *file_name, int typeflag) int status; int interdir_made = 0; - transform_member_name (¤t_stat_info.link_name, xform_symlink); - if (! absolute_names_option && (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name) || contains_dot_dot (current_stat_info.link_name))) diff --git a/src/incremen.c b/src/incremen.c index 372061d..7e1e366 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -60,6 +60,7 @@ struct dumpdir /* Dump directory listing */ /* Directory attributes. */ struct directory { + struct directory *next; struct timespec mtime; /* Modification time */ dev_t device_number; /* device number for directory */ ino_t inode_number; /* inode number for directory */ @@ -72,7 +73,7 @@ struct directory the original directory structure */ const char *tagfile; /* Tag file, if the directory falls under exclusion_tag_under */ - char name[1]; /* file name of directory */ + char *name; /* file name of directory */ }; struct dumpdir * @@ -80,13 +81,14 @@ dumpdir_create0 (const char *contents, const char *cmask) { struct dumpdir *dump; size_t i, total, ctsize, len; - const char *p; + char *p; + const char *q; - for (i = 0, total = 0, ctsize = 1, p = contents; *p; total++, p += len) + for (i = 0, total = 0, ctsize = 1, q = contents; *q; total++, q += len) { - len = strlen (p) + 1; + len = strlen (q) + 1; ctsize += len; - if (!cmask || strchr (cmask, *p)) + if (!cmask || strchr (cmask, *q)) i++; } dump = xmalloc (sizeof (*dump) + ctsize); @@ -196,6 +198,7 @@ dumpdir_size (const char *p) } +static struct directory *dirhead, *dirtail; static Hash_table *directory_table; static Hash_table *directory_meta_table; @@ -247,18 +250,68 @@ static struct directory * make_directory (const char *name) { size_t namelen = strlen (name); - size_t size = offsetof (struct directory, name) + namelen + 1; - struct directory *directory = xmalloc (size); + struct directory *directory = xmalloc (sizeof (*directory)); + directory->next = NULL; directory->dump = directory->idump = NULL; directory->orig = NULL; directory->flags = false; - strcpy (directory->name, name); - if (namelen && ISSLASH (directory->name[namelen - 1])) - directory->name[namelen - 1] = 0; + if (namelen && ISSLASH (name[namelen - 1])) + namelen--; + directory->name = xmalloc (namelen + 1); + memcpy (directory->name, name, namelen); + directory->name[namelen] = 0; directory->tagfile = NULL; return directory; } +static void +free_directory (struct directory *dir) +{ + free (dir->name); + free (dir); +} + +static struct directory * +attach_directory (const char *name) +{ + struct directory *dir = make_directory (name); + if (dirtail) + dirtail->next = dir; + else + dirhead = dir; + dirtail = dir; + return dir; +} + + +static void +replace_prefix (char **pname, const char *samp, size_t slen, + const char *repl, size_t rlen) +{ + char *name = *pname; + size_t nlen = strlen (name); + if (nlen > slen && memcmp (name, samp, slen) == 0 && ISSLASH (name[slen])) + { + if (rlen > slen) + { + name = xrealloc (name, nlen - slen + rlen + 1); + *pname = name; + } + memmove (name + rlen, name + slen, nlen - slen + 1); + memcpy (name, repl, rlen); + } +} + +void +dirlist_replace_prefix (const char *pref, const char *repl) +{ + struct directory *dp; + size_t pref_len = strlen (pref); + size_t repl_len = strlen (repl); + for (dp = dirhead; dp; dp = dp->next) + replace_prefix (&dp->name, pref, pref_len, repl, repl_len); +} + /* Create and link a new directory entry for directory NAME, having a device number DEV and an inode number INO, with NFS indicating whether it is an NFS device and FOUND indicating whether we have @@ -268,7 +321,7 @@ note_directory (char const *name, struct timespec mtime, dev_t dev, ino_t ino, bool nfs, bool found, const char *contents) { - struct directory *directory = make_directory (name); + struct directory *directory = attach_directory (name); directory->mtime = mtime; directory->device_number = dev; @@ -311,7 +364,7 @@ find_directory (const char *name) { struct directory *dir = make_directory (name); struct directory *ret = hash_lookup (directory_table, dir); - free (dir); + free_directory (dir); return ret; } } @@ -330,7 +383,7 @@ find_directory_meta (dev_t dev, ino_t ino) dir->device_number = dev; dir->inode_number = ino; ret = hash_lookup (directory_meta_table, dir); - free (dir); + free_directory (dir); return ret; } } @@ -386,12 +439,16 @@ procdir (char *name_buffer, struct stat *stat_data, stat_data->st_ino); if (d) { - if (verbose_option) - WARN ((0, 0, _("%s: Directory has been renamed from %s"), - quotearg_colon (name_buffer), - quote_n (1, d->name))); - directory->orig = d; - DIR_SET_FLAG (directory, DIRF_RENAMED); + if (strcmp (d->name, name_buffer)) + { + if (verbose_option) + WARN ((0, 0, _("%s: Directory has been renamed from %s"), + quotearg_colon (name_buffer), + quote_n (1, d->name))); + directory->orig = d; + DIR_SET_FLAG (directory, DIRF_RENAMED); + dirlist_replace_prefix (d->name, name_buffer); + } directory->children = CHANGED_CHILDREN; } else @@ -426,12 +483,16 @@ procdir (char *name_buffer, struct stat *stat_data, if (d) { - if (verbose) - WARN ((0, 0, _("%s: Directory has been renamed from %s"), - quotearg_colon (name_buffer), - quote_n (1, d->name))); - directory->orig = d; - DIR_SET_FLAG (directory, DIRF_RENAMED); + if (strcmp (d->name, name_buffer)) + { + if (verbose) + WARN ((0, 0, _("%s: Directory has been renamed from %s"), + quotearg_colon (name_buffer), + quote_n (1, d->name))); + directory->orig = d; + DIR_SET_FLAG (directory, DIRF_RENAMED); + dirlist_replace_prefix (d->name, name_buffer); + } directory->children = CHANGED_CHILDREN; } else @@ -701,12 +762,9 @@ obstack_code_rename (struct obstack *stk, char *from, char *to) obstack_grow (stk, s, strlen (s) + 1); } -static bool -rename_handler (void *data, void *proc_data) +static void +store_rename (struct directory *dir, struct obstack *stk) { - struct directory *dir = data; - struct obstack *stk = proc_data; - if (DIR_IS_RENAMED (dir)) { struct directory *prev, *p; @@ -745,7 +803,6 @@ rename_handler (void *data, void *proc_data) obstack_code_rename (stk, "", prev->name); } } - return true; } const char * @@ -753,8 +810,9 @@ append_incremental_renames (const char *dump) { struct obstack stk; size_t size; - - if (directory_table == NULL) + struct directory *dp; + + if (dirhead == NULL) return dump; obstack_init (&stk); @@ -766,7 +824,9 @@ append_incremental_renames (const char *dump) else size = 0; - hash_do_for_each (directory_table, rename_handler, &stk); + for (dp = dirhead; dp; dp = dp->next) + store_rename (dp, &stk); + if (obstack_object_size (&stk) != size) { obstack_1grow (&stk, 0); diff --git a/src/list.c b/src/list.c index b17f604..98c1e39 100644 --- a/src/list.c +++ b/src/list.c @@ -472,11 +472,11 @@ read_header (bool raw_extended_headers) static char * decode_xform (char *file_name, void *data) { - xform_type type = *(xform_type*)data; + int type = *(int*)data; switch (type) { - case xform_symlink: + case XFORM_SYMLINK: /* FIXME: It is not quite clear how and to which extent are the symbolic links subject to filename transformation. In the absence of another solution, symbolic links are exempt from component stripping and @@ -484,11 +484,11 @@ decode_xform (char *file_name, void *data) proper. */ return file_name; - case xform_link: + case XFORM_LINK: file_name = safer_name_suffix (file_name, true, absolute_names_option); break; - case xform_regfile: + case XFORM_REGFILE: file_name = safer_name_suffix (file_name, false, absolute_names_option); break; } @@ -505,9 +505,9 @@ decode_xform (char *file_name, void *data) } bool -transform_member_name (char **pinput, xform_type type) +transform_member_name (char **pinput, int type) { - return transform_name_fp (pinput, decode_xform, &type); + return transform_name_fp (pinput, type, decode_xform, &type); } #define ISOCTAL(c) ((c)>='0'&&(c)<='7') @@ -628,7 +628,16 @@ decode_header (union block *header, struct tar_stat_info *stat_info, stat_info->is_dumpdir = true; } - transform_member_name (&stat_info->file_name, xform_regfile); + transform_member_name (&stat_info->file_name, XFORM_REGFILE); + switch (header->header.typeflag) + { + case SYMTYPE: + transform_member_name (&stat_info->link_name, XFORM_SYMLINK); + break; + + case LNKTYPE: + transform_member_name (&stat_info->link_name, XFORM_LINK); + } } /* Convert buffer at WHERE0 of size DIGS from external format to diff --git a/src/names.c b/src/names.c index 73b8741..05f89b1 100644 --- a/src/names.c +++ b/src/names.c @@ -289,9 +289,8 @@ static int matching_flags; /* exclude_fnmatch options */ static storage and can't be relied upon across two calls. If CHANGE_DIRS is true, treat any entries of type NELT_CHDIR as - the request to change to the given directory. If filename_terminator - is NUL, CHANGE_DIRS is effectively always false. - + the request to change to the given directory. + Entries of type NELT_FMASK cause updates of the matching_flags value. */ struct name_elt * @@ -301,9 +300,6 @@ name_next_elt (int change_dirs) const char *source; char *cursor; - if (filename_terminator == '\0') - change_dirs = 0; - while (name_index != names) { struct name_elt *ep; @@ -392,9 +388,7 @@ name_gather (void) if (allocated_size == 0) { allocated_size = offsetof (struct name, name) + NAME_FIELD_SIZE + 1; - buffer = xmalloc (allocated_size); - /* FIXME: This memset is overkill, and ugly... */ - memset (buffer, 0, allocated_size); + buffer = xzalloc (allocated_size); } while ((ep = name_next_elt (0)) && ep->type == NELT_CHDIR) diff --git a/src/suffix.c b/src/suffix.c index fcf2297..986f347 100644 --- a/src/suffix.c +++ b/src/suffix.c @@ -39,6 +39,7 @@ struct compression_suffix compression_suffixes[] = { { S(tz2, bzip2) }, { S(lzma, lzma) }, { S(tlz, lzma) }, + { S(lzo, lzop) }, #undef S }; diff --git a/src/system.c b/src/system.c index e57e6da..c90a40d 100644 --- a/src/system.c +++ b/src/system.c @@ -1,6 +1,7 @@ /* System-dependent calls for tar. - Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, + 2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -51,12 +52,7 @@ sys_detect_dev_null_output (void) } void -sys_drain_input_pipe (void) -{ -} - -void -sys_wait_for_child (pid_t child_pid) +sys_wait_for_child (pid_t child_pid, bool eof) { } @@ -160,26 +156,8 @@ sys_detect_dev_null_output (void) && archive_stat.st_ino == dev_null_stat.st_ino)); } -/* Manage to fully drain a pipe we might be reading, so to not break it on - the producer after the EOF block. FIXME: one of these days, GNU tar - might become clever enough to just stop working, once there is no more - work to do, we might have to revise this area in such time. */ - -void -sys_drain_input_pipe (void) -{ - size_t r; - - if (access_mode == ACCESS_READ - && ! _isrmt (archive) - && (S_ISFIFO (archive_stat.st_mode) || S_ISSOCK (archive_stat.st_mode))) - while ((r = rmtread (archive, record_start->buffer, record_size)) != 0 - && r != SAFE_READ_ERROR) - continue; -} - void -sys_wait_for_child (pid_t child_pid) +sys_wait_for_child (pid_t child_pid, bool eof) { if (child_pid) { @@ -193,8 +171,11 @@ sys_wait_for_child (pid_t child_pid) } if (WIFSIGNALED (wait_status)) - ERROR ((0, 0, _("Child died with signal %d"), - WTERMSIG (wait_status))); + { + int sig = WTERMSIG (wait_status); + if (!(!eof && sig == SIGPIPE)) + ERROR ((0, 0, _("Child died with signal %d"), sig)); + } else if (WEXITSTATUS (wait_status) != 0) ERROR ((0, 0, _("Child returned status %d"), WEXITSTATUS (wait_status))); diff --git a/src/tar.c b/src/tar.c index 4a58a74..ae0c739 100644 --- a/src/tar.c +++ b/src/tar.c @@ -271,15 +271,17 @@ enum IGNORE_FAILED_READ_OPTION, INDEX_FILE_OPTION, KEEP_NEWER_FILES_OPTION, - LZMA_OPTION, + LZOP_OPTION, MODE_OPTION, MTIME_OPTION, NEWER_MTIME_OPTION, NO_ANCHORED_OPTION, + NO_AUTO_COMPRESS_OPTION, NO_CHECK_DEVICE_OPTION, NO_DELAY_DIRECTORY_RESTORE_OPTION, NO_IGNORE_CASE_OPTION, NO_IGNORE_COMMAND_ERROR_OPTION, + NO_NULL_OPTION, NO_OVERWRITE_DIR_OPTION, NO_QUOTE_CHARS_OPTION, NO_RECURSION_OPTION, @@ -350,7 +352,7 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n /* NOTE: - Available option letters are DEIJQY and eqy. Consider the following + Available option letters are DEIQY and eqy. Consider the following assignments: [For Solaris tar compatibility =/= Is it important at all?] @@ -592,6 +594,9 @@ static struct argp_option options[] = { N_("Compression options:"), GRID }, {"auto-compress", 'a', 0, 0, N_("use archive suffix to determine the compression program"), GRID+1 }, + {"no-auto-compress", NO_AUTO_COMPRESS_OPTION, 0, 0, + N_("do not use use archive suffix to determine the compression program"), + GRID+1 }, {"bzip2", 'j', 0, 0, N_("filter the archive through bzip2"), GRID+1 }, {"gzip", 'z', 0, 0, @@ -601,8 +606,10 @@ static struct argp_option options[] = { {"compress", 'Z', 0, 0, N_("filter the archive through compress"), GRID+1 }, {"uncompress", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, - {"lzma", LZMA_OPTION, 0, 0, + {"lzma", 'J', 0, 0, N_("filter the archive through lzma"), GRID+1 }, + {"lzop", LZOP_OPTION, 0, 0, + N_("filter the archive through lzop"), GRID+8 }, {"use-compress-program", USE_COMPRESS_PROGRAM_OPTION, N_("PROG"), 0, N_("filter through PROG (must accept -d)"), GRID+1 }, #undef GRID @@ -619,6 +626,8 @@ static struct argp_option options[] = { N_("get names to extract or create from FILE"), GRID+1 }, {"null", NULL_OPTION, 0, 0, N_("-T reads null-terminated names, disable -C"), GRID+1 }, + {"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 }, {"no-unquote", NO_UNQUOTE_OPTION, 0, 0, @@ -677,6 +686,7 @@ static struct argp_option options[] = { GRID+1 }, {"transform", TRANSFORM_OPTION, N_("EXPRESSION"), 0, N_("use sed replace EXPRESSION to transform file names"), GRID+1 }, + {"xform", 0, 0, OPTION_ALIAS, NULL, GRID+1 }, #undef GRID #define GRID 120 @@ -849,6 +859,16 @@ exclude_vcs_files () "=RELEASE-ID", "=meta-update", "=update", + /* Bazaar */ + ".bzr", + ".bzrignore", + ".bzrtags", + /* Mercurial */ + ".hg", + ".hgignore", + ".hgtags", + /* darcs */ + "_darcs", NULL }; @@ -1029,6 +1049,9 @@ report_textual_dates (struct tar_args *args) static volatile int _argp_hang; +/* Either NL or NUL, as decided by the --null option. */ +static char filename_terminator; + enum read_file_list_state /* Result of reading file name from the list file */ { file_list_success, /* OK, name read successfully */ @@ -1037,16 +1060,16 @@ enum read_file_list_state /* Result of reading file name from the list file */ file_list_skip /* Empty (zero-length) entry encountered, skip it */ }; -/* Read from FP a sequence of characters up to FILENAME_TERMINATOR and put them +/* Read from FP a sequence of characters up to TERM and put them into STK. */ static enum read_file_list_state -read_name_from_file (FILE *fp, struct obstack *stk) +read_name_from_file (FILE *fp, struct obstack *stk, int term) { int c; size_t counter = 0; - for (c = getc (fp); c != EOF && c != filename_terminator; c = getc (fp)) + for (c = getc (fp); c != EOF && c != term; c = getc (fp)) { if (c == 0) { @@ -1127,7 +1150,8 @@ update_argv (const char *filename, struct argp_state *state) size_t new_argc; bool is_stdin = false; enum read_file_list_state read_state; - + int term = filename_terminator; + if (!strcmp (filename, "-")) { is_stdin = true; @@ -1141,7 +1165,8 @@ update_argv (const char *filename, struct argp_state *state) open_fatal (filename); } - while ((read_state = read_name_from_file (fp, &argv_stk)) != file_list_end) + while ((read_state = read_name_from_file (fp, &argv_stk, term)) + != file_list_end) { switch (read_state) { @@ -1170,7 +1195,7 @@ update_argv (const char *filename, struct argp_state *state) obstack_1grow (&argv_stk, 0); count = 1; /* Read rest of files using new filename terminator */ - filename_terminator = 0; + term = 0; break; } @@ -1187,7 +1212,7 @@ update_argv (const char *filename, struct argp_state *state) start = obstack_finish (&argv_stk); - if (filename_terminator == 0) + if (term == 0) for (p = start; *p; p += strlen (p) + 1) if (p[0] == '-') count++; @@ -1203,7 +1228,7 @@ update_argv (const char *filename, struct argp_state *state) for (i = state->next, p = start; *p; p += strlen (p) + 1, i++) { - if (filename_terminator == 0 && p[0] == '-') + if (term == 0 && p[0] == '-') state->argv[i++] = "--add-file"; state->argv[i] = p; } @@ -1252,6 +1277,10 @@ parse_opt (int key, char *arg, struct argp_state *state) case 'a': args->compress_autodetect = true; break; + + case NO_AUTO_COMPRESS_OPTION: + args->compress_autodetect = false; + break; case 'b': { @@ -1345,6 +1374,10 @@ parse_opt (int key, char *arg, struct argp_state *state) set_use_compress_program_option ("bzip2"); break; + case 'J': + set_use_compress_program_option ("lzma"); + break; + case 'k': /* Don't replace existing files. */ old_files_option = KEEP_OLD_FILES; @@ -1376,8 +1409,8 @@ parse_opt (int key, char *arg, struct argp_state *state) } break; - case LZMA_OPTION: - set_use_compress_program_option ("lzma"); + case LZOP_OPTION: + set_use_compress_program_option ("lzop"); break; case 'm': @@ -1721,6 +1754,10 @@ parse_opt (int key, char *arg, struct argp_state *state) filename_terminator = '\0'; break; + case NO_NULL_OPTION: + filename_terminator = '\n'; + break; + case NUMERIC_OWNER_OPTION: numeric_owner_option = true; break; @@ -1783,6 +1820,8 @@ parse_opt (int key, char *arg, struct argp_state *state) /* FIXME: What it is good for? */ same_permissions_option = true; same_order_option = true; + WARN ((0, 0, _("The --preserve option is deprecated, " + "use --preserve-permissions --preserve-order instead"))); break; case RECORD_SIZE_OPTION: @@ -2307,6 +2346,13 @@ decode_options (int argc, char **argv) else if (utc_option) verbose_option = 2; + if (tape_length_option && tape_length_option < record_size) + 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"))); + /* Forbid using -c with no input files whatsoever. Check that `-f -', explicit or implied, is used correctly. */ @@ -2480,7 +2526,7 @@ main (int argc, char **argv) name_term (); if (exit_status == TAREXIT_FAILURE) - error (0, 0, _("Error exit delayed from previous errors")); + error (0, 0, _("Exiting with failure status due to previous errors")); if (stdlis == stdout) close_stdout (); diff --git a/src/transform.c b/src/transform.c index fc3eb48..2e0de31 100644 --- a/src/transform.c +++ b/src/transform.c @@ -61,6 +61,7 @@ struct transform { struct transform *next; enum transform_type transform_type; + int flags; unsigned match_number; regex_t regex; /* Compiled replacement expression */ @@ -69,6 +70,8 @@ struct transform }; + +int transform_flags = XFORM_ALL; static struct transform *transform_head, *transform_tail; static struct transform * @@ -131,6 +134,41 @@ add_backref_segment (struct transform *tf, size_t ref) segm->v.ref = ref; } +static int +parse_xform_flags (int *pflags, int c) +{ + switch (c) + { + case 'r': + *pflags |= XFORM_REGFILE; + break; + + case 'R': + *pflags &= ~XFORM_REGFILE; + break; + + case 'h': + *pflags |= XFORM_LINK; + break; + + case 'H': + *pflags &= ~XFORM_LINK; + break; + + case 's': + *pflags |= XFORM_SYMLINK; + break; + + case 'S': + *pflags &= ~XFORM_SYMLINK; + break; + + default: + return 1; + } + return 0; +} + static void add_case_ctl_segment (struct transform *tf, enum case_ctl_type ctl) { @@ -150,8 +188,26 @@ parse_transform_expr (const char *expr) struct transform *tf = new_transform (); if (expr[0] != 's') - USAGE_ERROR ((0, 0, _("Invalid transform expression"))); - + { + if (strncmp (expr, "flags=", 6) == 0) + { + transform_flags = 0; + for (expr += 6; *expr; expr++) + { + if (*expr == ';') + { + expr++; + break; + } + if (parse_xform_flags (&transform_flags, *expr)) + USAGE_ERROR ((0, 0, _("Unknown transform flag: %c"), + *expr)); + } + return expr; + } + USAGE_ERROR ((0, 0, _("Invalid transform expression"))); + } + delim = expr[1]; /* Scan regular expression */ @@ -172,6 +228,7 @@ parse_transform_expr (const char *expr) /* Check flags */ tf->transform_type = transform_first; + tf->flags = transform_flags; for (p = expr + j + 1; *p && *p != ';'; p++) switch (*p) { @@ -186,7 +243,7 @@ parse_transform_expr (const char *expr) case 'x': cflags |= REG_EXTENDED; break; - + case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': tf->match_number = strtoul (p, (char**) &p, 0); @@ -194,8 +251,9 @@ parse_transform_expr (const char *expr) break; default: - USAGE_ERROR ((0, 0, _("Unknown flag in transform expression: %c"), - *p)); + if (parse_xform_flags (&tf->flags, *p)) + USAGE_ERROR ((0, 0, _("Unknown flag in transform expression: %c"), + *p)); } if (*p == ';') @@ -520,10 +578,11 @@ _single_transform_name_to_obstack (struct transform *tf, char *input) } bool -_transform_name_to_obstack (char *input, char **output) +_transform_name_to_obstack (int flags, char *input, char **output) { struct transform *tf; - + bool alloced = false; + if (!stk_init) { obstack_init (&stk); @@ -532,18 +591,23 @@ _transform_name_to_obstack (char *input, char **output) for (tf = transform_head; tf; tf = tf->next) { - _single_transform_name_to_obstack (tf, input); - input = obstack_finish (&stk); + if (tf->flags & flags) + { + _single_transform_name_to_obstack (tf, input); + input = obstack_finish (&stk); + alloced = true; + } } *output = input; - return transform_head != NULL; + return alloced; } bool -transform_name_fp (char **pinput, char *(*fun)(char *, void *), void *dat) +transform_name_fp (char **pinput, int flags, + char *(*fun)(char *, void *), void *dat) { char *str; - bool ret = _transform_name_to_obstack (*pinput, &str); + bool ret = _transform_name_to_obstack (flags, *pinput, &str); if (ret) { assign_string (pinput, fun ? fun (str, dat) : str); @@ -560,8 +624,8 @@ transform_name_fp (char **pinput, char *(*fun)(char *, void *), void *dat) } bool -transform_name (char **pinput) +transform_name (char **pinput, int type) { - return transform_name_fp (pinput, NULL, NULL); + return transform_name_fp (pinput, type, NULL, NULL); } diff --git a/src/xheader.c b/src/xheader.c index 9be0a2f..919ecd3 100644 --- a/src/xheader.c +++ b/src/xheader.c @@ -25,8 +25,6 @@ #include "common.h" -#include - static bool xheader_protected_pattern_p (char const *pattern); static bool xheader_protected_keyword_p (char const *keyword); static void xheader_set_single_keyword (char *) __attribute__ ((noreturn)); diff --git a/tests/Makefile.am b/tests/Makefile.am index 729bdd9..cad0dfe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -89,6 +89,7 @@ TESTSUITE_AT = \ multiv03.at\ multiv04.at\ multiv05.at\ + multiv06.at\ old.at\ options.at\ options02.at\ @@ -97,6 +98,8 @@ TESTSUITE_AT = \ rename01.at\ rename02.at\ rename03.at\ + rename04.at\ + rename05.at\ same-order01.at\ same-order02.at\ shortfile.at\ diff --git a/tests/Makefile.in b/tests/Makefile.in index e486e3e..ba2b879 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -50,19 +50,20 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.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/closeout.m4 \ - $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \ + $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ + $(top_srcdir)/m4/closeout.m4 $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/d-ino.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/dirname.m4 \ $(top_srcdir)/m4/dos.m4 $(top_srcdir)/m4/double-slash-root.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ - $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/eoverflow.m4 \ + $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \ $(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fcntl-safer.m4 \ - $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fileblocks.m4 \ - $(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fnmatch.m4 \ - $(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/fseeko.m4 \ - $(top_srcdir)/m4/ftruncate.m4 \ + $(top_srcdir)/m4/fchdir.m4 $(top_srcdir)/m4/fclose.m4 \ + $(top_srcdir)/m4/fcntl-safer.m4 $(top_srcdir)/m4/fcntl_h.m4 \ + $(top_srcdir)/m4/fileblocks.m4 $(top_srcdir)/m4/float_h.m4 \ + $(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \ + $(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/ftruncate.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getdelim.m4 \ @@ -87,41 +88,43 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openat.m4 \ - $(top_srcdir)/m4/pathmax.m4 $(top_srcdir)/m4/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/open.m4 \ + $(top_srcdir)/m4/openat.m4 $(top_srcdir)/m4/pathmax.m4 \ + $(top_srcdir)/m4/paxutils.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ - $(top_srcdir)/m4/regex.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/setenv.m4 \ - $(top_srcdir)/m4/sleep.m4 $(top_srcdir)/m4/snprintf.m4 \ - $(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stat-time.m4 \ - $(top_srcdir)/m4/stdarg.m4 $(top_srcdir)/m4/stdbool.m4 \ - $(top_srcdir)/m4/stdint.m4 $(top_srcdir)/m4/stdint_h.m4 \ - $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ - $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/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/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/sys_stat_h.m4 \ - $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \ - $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes-null.m4 \ - $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vsnprintf.m4 $(top_srcdir)/m4/wchar.m4 \ - $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wctype.m4 \ - $(top_srcdir)/m4/wcwidth.m4 $(top_srcdir)/m4/wint_t.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/sleep.m4 \ + $(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/ssize_t.m4 \ + $(top_srcdir)/m4/stat-time.m4 $(top_srcdir)/m4/stdarg.m4 \ + $(top_srcdir)/m4/stdbool.m4 $(top_srcdir)/m4/stdint.m4 \ + $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \ + $(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 \ + $(top_srcdir)/m4/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/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/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_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/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vsnprintf.m4 \ + $(top_srcdir)/m4/wchar.m4 $(top_srcdir)/m4/wchar_t.m4 \ + $(top_srcdir)/m4/wctype.m4 $(top_srcdir)/m4/wcwidth.m4 \ + $(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/write.m4 \ $(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xgetcwd.m4 \ $(top_srcdir)/m4/xsize.m4 $(top_srcdir)/m4/xstrndup.m4 \ $(top_srcdir)/m4/xstrtol.m4 $(top_srcdir)/configure.ac @@ -184,7 +187,13 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ -EOVERFLOW = @EOVERFLOW@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FCNTL_H = @FCNTL_H@ FLOAT_H = @FLOAT_H@ @@ -194,30 +203,47 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ATOLL = @GNULIB_ATOLL@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ +GNULIB_CLOSE = @GNULIB_CLOSE@ +GNULIB_DIRFD = @GNULIB_DIRFD@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ +GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ GNULIB_FCHDIR = @GNULIB_FCHDIR@ +GNULIB_FCLOSE = @GNULIB_FCLOSE@ GNULIB_FFLUSH = @GNULIB_FFLUSH@ GNULIB_FOPEN = @GNULIB_FOPEN@ +GNULIB_FPRINTF = @GNULIB_FPRINTF@ GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@ +GNULIB_FPUTC = @GNULIB_FPUTC@ +GNULIB_FPUTS = @GNULIB_FPUTS@ GNULIB_FREOPEN = @GNULIB_FREOPEN@ GNULIB_FSEEK = @GNULIB_FSEEK@ GNULIB_FSEEKO = @GNULIB_FSEEKO@ +GNULIB_FSYNC = @GNULIB_FSYNC@ GNULIB_FTELL = @GNULIB_FTELL@ GNULIB_FTELLO = @GNULIB_FTELLO@ GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@ +GNULIB_FWRITE = @GNULIB_FWRITE@ GNULIB_GETCWD = @GNULIB_GETCWD@ GNULIB_GETDELIM = @GNULIB_GETDELIM@ +GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@ +GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@ +GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@ GNULIB_GETLINE = @GNULIB_GETLINE@ +GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@ GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@ GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@ GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@ +GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ +GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ GNULIB_LSEEK = @GNULIB_LSEEK@ +GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ @@ -238,15 +264,26 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@ GNULIB_MEMRCHR = @GNULIB_MEMRCHR@ GNULIB_MKDTEMP = @GNULIB_MKDTEMP@ GNULIB_MKSTEMP = @GNULIB_MKSTEMP@ +GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ +GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ +GNULIB_PERROR = @GNULIB_PERROR@ +GNULIB_PRINTF = @GNULIB_PRINTF@ GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@ +GNULIB_PUTC = @GNULIB_PUTC@ +GNULIB_PUTCHAR = @GNULIB_PUTCHAR@ GNULIB_PUTENV = @GNULIB_PUTENV@ +GNULIB_PUTS = @GNULIB_PUTS@ +GNULIB_RANDOM_R = @GNULIB_RANDOM_R@ +GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ +GNULIB_RPMATCH = @GNULIB_RPMATCH@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@ +GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@ GNULIB_STPCPY = @GNULIB_STPCPY@ GNULIB_STPNCPY = @GNULIB_STPNCPY@ GNULIB_STRCASESTR = @GNULIB_STRCASESTR@ @@ -262,25 +299,35 @@ GNULIB_STRSTR = @GNULIB_STRSTR@ GNULIB_STRTOD = @GNULIB_STRTOD@ GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@ +GNULIB_STRTOLL = @GNULIB_STRTOLL@ +GNULIB_STRTOULL = @GNULIB_STRTOULL@ GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@ +GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ +GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VFPRINTF = @GNULIB_VFPRINTF@ GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@ +GNULIB_VPRINTF = @GNULIB_VPRINTF@ GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@ GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@ GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ +GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ATOLL = @HAVE_ATOLL@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ +HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ +HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@ HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@ HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@ HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@ -HAVE_DECL_MKDIR = @HAVE_DECL_MKDIR@ +HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@ HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@ HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@ HAVE_DECL_STRERROR = @HAVE_DECL_STRERROR@ @@ -294,22 +341,31 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ HAVE_DUP2 = @HAVE_DUP2@ +HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ +HAVE_FSYNC = @HAVE_FSYNC@ HAVE_FTELLO = @HAVE_FTELLO@ HAVE_FTRUNCATE = @HAVE_FTRUNCATE@ +HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@ +HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@ +HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@ HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@ HAVE_GETSUBOPT = @HAVE_GETSUBOPT@ +HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ -HAVE_IO_H = @HAVE_IO_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ +HAVE_LCHMOD = @HAVE_LCHMOD@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_R = @HAVE_RANDOM_R@ +HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@ HAVE_READLINK = @HAVE_READLINK@ HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@ +HAVE_RPMATCH = @HAVE_RPMATCH@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -325,10 +381,15 @@ HAVE_STRNDUP = @HAVE_STRNDUP@ HAVE_STRPBRK = @HAVE_STRPBRK@ HAVE_STRSEP = @HAVE_STRSEP@ HAVE_STRTOD = @HAVE_STRTOD@ +HAVE_STRTOLL = @HAVE_STRTOLL@ +HAVE_STRTOULL = @HAVE_STRTOULL@ +HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@ HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@ +HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ +HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ @@ -370,6 +431,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_FLOAT_H = @NEXT_FLOAT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -395,13 +457,16 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POSUB = @POSUB@ +PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@ PRIPTR_PREFIX = @PRIPTR_PREFIX@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ REPLACE_CHOWN = @REPLACE_CHOWN@ +REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ +REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ REPLACE_FOPEN = @REPLACE_FOPEN@ REPLACE_FPRINTF = @REPLACE_FPRINTF@ @@ -414,18 +479,25 @@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ +REPLACE_LSTAT = @REPLACE_LSTAT@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ +REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@ +REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@ REPLACE_OPEN = @REPLACE_OPEN@ +REPLACE_PERROR = @REPLACE_PERROR@ REPLACE_PRINTF = @REPLACE_PRINTF@ REPLACE_PUTENV = @REPLACE_PUTENV@ REPLACE_SNPRINTF = @REPLACE_SNPRINTF@ REPLACE_SPRINTF = @REPLACE_SPRINTF@ +REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@ REPLACE_STRCASESTR = @REPLACE_STRCASESTR@ +REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRPTIME = @REPLACE_STRPTIME@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ @@ -438,6 +510,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ +REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ @@ -453,6 +526,7 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@ UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@ +UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ VOID_UNSETENV = @VOID_UNSETENV@ @@ -567,6 +641,7 @@ TESTSUITE_AT = \ multiv03.at\ multiv04.at\ multiv05.at\ + multiv06.at\ old.at\ options.at\ options02.at\ @@ -575,6 +650,8 @@ TESTSUITE_AT = \ rename01.at\ rename02.at\ rename03.at\ + rename04.at\ + rename05.at\ same-order01.at\ same-order02.at\ shortfile.at\ diff --git a/tests/atlocal.in b/tests/atlocal.in index 380cac0..5eaaab6 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -30,4 +30,8 @@ tarball_prereq() { echo "$2 $3/$1" | md5sum --status --check - >/dev/null 2>&1 } +decho() { + echo $* + echo >&2 $* +} diff --git a/tests/delete05.at b/tests/delete05.at index d4880b8..66c6367 100644 --- a/tests/delete05.at +++ b/tests/delete05.at @@ -42,7 +42,7 @@ tar tf archive to ], [tar: tre: Not found in archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ]) AT_CLEANUP diff --git a/tests/genfile.c b/tests/genfile.c index 91cf5b4..1b338bc 100644 --- a/tests/genfile.c +++ b/tests/genfile.c @@ -261,13 +261,11 @@ verify_file (char *file_name) error (0, errno, _("stat(%s) failed"), file_name); if (st.st_size != file_length + seek_offset) - { - printf ("%lu %lu\n", (unsigned long)st.st_size , (unsigned long)file_length); - exit (1); - } + error (1, 0, _("requested file length %lu, actual %lu"), + (unsigned long)st.st_size, (unsigned long)file_length); if (mode == mode_sparse && !ST_IS_SPARSE (st)) - exit (1); + error (1, 0, _("created file is not sparse")); } } diff --git a/tests/gzip.at b/tests/gzip.at index f3a4a86..eb43030 100644 --- a/tests/gzip.at +++ b/tests/gzip.at @@ -35,7 +35,7 @@ test $? = 2 || exit 1 [ gzip: stdin: unexpected end of file tar: Child returned status 1 -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ], [],[]) diff --git a/tests/ignfail.at b/tests/ignfail.at index f1d9d33..03f9045 100644 --- a/tests/ignfail.at +++ b/tests/ignfail.at @@ -64,12 +64,12 @@ test $status = 0 [ ----- tar: file: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: file: Warning: Cannot open: Permission denied ----- tar: directory: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: directory: Warning: Cannot open: Permission denied ]) diff --git a/tests/incremental.at b/tests/incremental.at index bab0beb..5873d83 100644 --- a/tests/incremental.at +++ b/tests/incremental.at @@ -44,7 +44,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure ], diff --git a/tests/listed01.at b/tests/listed01.at index 56584f2..b9fc2e4 100644 --- a/tests/listed01.at +++ b/tests/listed01.at @@ -39,7 +39,7 @@ tar --create \ tar tf archive.1 || exit 1 -sleep 1 +sleep 2 genfile --length 10240 --pattern zeros --file directory/file2 diff --git a/tests/longv7.at b/tests/longv7.at index e8eae5a..9f03744 100644 --- a/tests/longv7.at +++ b/tests/longv7.at @@ -40,7 +40,7 @@ tar tf archive DIR/ ], [tar: DIR/FILE: file name is too long (max 99); not dumped -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ], [],[],[v7]) diff --git a/tests/lustar01.at b/tests/lustar01.at index f50a9ab..580aa85 100644 --- a/tests/lustar01.at +++ b/tests/lustar01.at @@ -31,7 +31,7 @@ tar cf archive LONGNAME [2], [], [tar: LONGNAME: file name is too long (cannot be split); not dumped -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ],[],[],[ustar]) AT_CLEANUP diff --git a/tests/lustar02.at b/tests/lustar02.at index 7f683d8..83e0b53 100644 --- a/tests/lustar02.at +++ b/tests/lustar02.at @@ -36,7 +36,7 @@ tar cf archive PREFIX_155 [2], [], [tar: PREFIX_155/: file name is too long (cannot be split); not dumped -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ],[],[],[ustar]) AT_CLEANUP diff --git a/tests/multiv05.at b/tests/multiv05.at index 986056e..2e5b74c 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 (C) 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. # This 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,11 +19,11 @@ # 02110-1301, USA. # Up to version 1.15.91 tar was unable to recognize all volumes -# given after an aout-of-sync volume. +# given after an out-of-sync volume. # Reported by: Joerg Weilbier # References: <200610011952.29880.gnu@weilbier.net> -AT_SETUP([Restoring after an out of sync folume]) +AT_SETUP([Restoring after an out of sync volume]) AT_KEYWORDS([multivolume multiv multiv05 sync]) m4_define([FILELIST],[jeden,dwa,trzy,cztery,piec,szesc]) diff --git a/tests/multiv06.at b/tests/multiv06.at new file mode 100644 index 0000000..9665299 --- /dev/null +++ b/tests/multiv06.at @@ -0,0 +1,52 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- + +# Test suite for GNU tar. +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# When volume size equals record size, swapping buffers in +# new_volume triggers a call to flush_archive. The size left variables +# must be corrected after that, which was not done in versions <= 1.20. +# Reported by: Marek Kielar +# References: <1907cbb6.79e32b49.48887f09.fd55@o2.pl> + +AT_SETUP([Multivolumes with L=record_size]) +AT_KEYWORDS([multivolume multiv multiv06]) + +AT_TAR_CHECK([ +exec <&- +decho Creating file +genfile --length 20139 --file file +decho Creating archive +tar -c -M -L10 -b20 -farc.1 -farc.2 -farc.3 file +decho Testing archive +tar -t -M -farc.1 -farc.2 -farc.3], +[0], +[Creating file +Creating archive +Testing archive +file +], +[Creating file +Creating archive +Testing archive +], +[],[], +[gnu, pax]) + +AT_CLEANUP + diff --git a/tests/package.m4 b/tests/package.m4 index 7fc4edd..0998247 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.20]) -m4_define([AT_PACKAGE_STRING], [GNU tar 1.20]) +m4_define([AT_PACKAGE_VERSION], [1.21]) +m4_define([AT_PACKAGE_STRING], [GNU tar 1.21]) m4_define([AT_PACKAGE_BUGREPORT], [bug-tar@gnu.org]) diff --git a/tests/rename04.at b/tests/rename04.at new file mode 100644 index 0000000..3e9eb1a --- /dev/null +++ b/tests/rename04.at @@ -0,0 +1,83 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- + +# Test suite for GNU tar. +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Description: Up to version 1.20, when storing a record for renamed +# directory in an incremental archive, tar incorrectly flagged all its +# subdirectories as renamed, which led to problems at archive extraction. +# References: <00a401c8ecc0$56b7ef30$6a17a8c0@inti.com> +# Reported by: Enric Hernandez + +AT_SETUP([renamed directory containing subdirectories]) +AT_KEYWORDS([incremental rename04 rename]) + +AT_TAR_CHECK([ +AT_SORT_PREREQ + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +], +[0], +[Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir +], +[Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore +],[],[],[gnu, oldgnu, posix]) + +AT_CLEANUP + +# End of rename04.at + + diff --git a/tests/rename05.at b/tests/rename05.at new file mode 100644 index 0000000..3ad93a6 --- /dev/null +++ b/tests/rename05.at @@ -0,0 +1,81 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- + +# Test suite for GNU tar. +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# Description: A continuation of rename04.at, that checks additionally if +# renamed subdirectories are restored correctly. + +AT_SETUP([renamed subdirectories]) +AT_KEYWORDS([incremental rename05 rename]) + +AT_TAR_CHECK([ +AT_SORT_PREREQ + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +], +[0], +[Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir.0 +], +[Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore +],[],[],[gnu, oldgnu, posix]) + +AT_CLEANUP + +# End of rename05.at + + diff --git a/tests/shortfile.at b/tests/shortfile.at index dbebc50..1c0b4dc 100644 --- a/tests/shortfile.at +++ b/tests/shortfile.at @@ -33,7 +33,7 @@ tar tf foo [2], [], [tar: This does not look like a tar archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ], [],[],[gnu]) diff --git a/tests/sparsemv.at b/tests/sparsemv.at index a0d375e..81da613 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 (C) 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,18 +35,18 @@ echo "Pass 1: Split between data blocks" echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 echo "Pass 2: Split within a data block" genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || AT_SKIP_TEST echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 ], [0], [Pass 1: Split between data blocks diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at index 2674813..2edd823 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 (C) 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -56,5 +56,7 @@ Test archive sparsefile Compare archive ], -[],[],[],[pax])]) +[tar: Record size = 12 blocks +tar: Record size = 12 blocks +],[],[],[pax])]) diff --git a/tests/testsuite b/tests/testsuite index 1a9f12a..880890c 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -620,7 +620,7 @@ at_times_file=$at_suite_dir/at-times # List of the tested programs. at_tested='tar' # List of the all the test groups. -at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74' +at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77' # As many question marks as there are digits in the last test group number. # Used to normalize the test group numbers so that `ls' lists them in # numerical order. @@ -661,45 +661,48 @@ at_help_all="1;version.at:19;tar version;; 33;rename01.at:24;renamed dirs in incrementals;incremental rename rename01; 34;rename02.at:24;move between hierarchies;incremental rename rename02; 35;rename03.at:23;cyclic renames;incremental rename rename03 cyclic-rename; -36;chtype.at:27;changed file types in incrementals;incremental chtype; -37;ignfail.at:23;ignfail;ignfail; -38;link01.at:33;link count gt 2;link01; -39;longv7.at:24;long names in V7 archives;longname longv7; -40;long01.at:28;long file names divisible by block size;longname long512; -41;lustar01.at:21;ustar: unsplittable file name;longname ustar lustar01; -42;lustar02.at:21;ustar: unsplittable path name;longname ustar lustar02; -43;lustar03.at:21;ustar: splitting long names;longname ustar lustar03; -44;multiv01.at:23;multivolume dumps from pipes;multivolume multiv multiv01; -45;multiv02.at:28;skipping a straddling member;multivolume multiv multiv02; -46;multiv03.at:30;MV archive & long filenames;multivolume multiv multiv03; -47;multiv04.at:36;split directory members in a MV archive;multivolume multiv incremental multiv04; -48;multiv05.at:26;Restoring after an out of sync folume;multivolume multiv multiv05 sync; -49;old.at:23;old archives;old; -50;recurse.at:21;recurse;recurse; -51;same-order01.at:26;working -C with --same-order;same-order same-order01; -52;same-order02.at:25;multiple -C options;same-order same-order02; -53;shortrec.at:25;short records;shortrec.at; -54;sparse01.at:21;sparse files;sparse sparse01; -55;sparse02.at:21;extracting sparse file over a pipe;sparse sparse02; -56;sparse03.at:21;storing sparse files > 8G;sparse sparse03; -57;sparsemv.at:21;sparse files in MV archives;sparse multiv sparsemv; -58;spmvp00.at:21;sparse files in PAX MV archives, v.0.0;sparse multiv sparsemvp sparsemvp00; -59;spmvp01.at:21;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01; -60;spmvp10.at:21;sparse files in PAX MV archives, v.1.0;sparse multiv sparsemvp sparsemvp10; -61;update.at:27;update unchanged directories;update; -62;volume.at:23;volume;volume volcheck; -63;volsize.at:29;volume header size;volume volsize; -64;comprec.at:21;compressed format recognition;comprec; -65;shortfile.at:26;short input files;shortfile shortfile0; -66;shortupd.at:29;updating short archives;shortfile shortfile1 shortupd; -67;truncate.at:29;truncate;truncate filechange; -68;grow.at:24;grow;grow filechange; -69;gtarfail.at:21;gtarfail;star gtarfail; -70;gtarfail2.at:21;gtarfail2;star gtarfail2; -71;multi-fail.at:21;multi-fail;star multivolume multiv multi-fail; -72;ustar-big-2g.at:21;ustar-big-2g;star ustar-big-2g; -73;ustar-big-8g.at:21;ustar-big-8g;star ustar-big-8g; -74;pax-big-10g.at:21;pax-big-10g;star pax-big-10g; +36;rename04.at:27;renamed directory containing subdirectories;incremental rename04 rename; +37;rename05.at:24;renamed subdirectories;incremental rename05 rename; +38;chtype.at:27;changed file types in incrementals;incremental chtype; +39;ignfail.at:23;ignfail;ignfail; +40;link01.at:33;link count gt 2;link01; +41;longv7.at:24;long names in V7 archives;longname longv7; +42;long01.at:28;long file names divisible by block size;longname long512; +43;lustar01.at:21;ustar: unsplittable file name;longname ustar lustar01; +44;lustar02.at:21;ustar: unsplittable path name;longname ustar lustar02; +45;lustar03.at:21;ustar: splitting long names;longname ustar lustar03; +46;multiv01.at:23;multivolume dumps from pipes;multivolume multiv multiv01; +47;multiv02.at:28;skipping a straddling member;multivolume multiv multiv02; +48;multiv03.at:30;MV archive & long filenames;multivolume multiv multiv03; +49;multiv04.at:36;split directory members in a MV archive;multivolume multiv incremental multiv04; +50;multiv05.at:26;Restoring after an out of sync volume;multivolume multiv multiv05 sync; +51;multiv06.at:27;Multivolumes with L=record_size;multivolume multiv multiv06; +52;old.at:23;old archives;old; +53;recurse.at:21;recurse;recurse; +54;same-order01.at:26;working -C with --same-order;same-order same-order01; +55;same-order02.at:25;multiple -C options;same-order same-order02; +56;shortrec.at:25;short records;shortrec.at; +57;sparse01.at:21;sparse files;sparse sparse01; +58;sparse02.at:21;extracting sparse file over a pipe;sparse sparse02; +59;sparse03.at:21;storing sparse files > 8G;sparse sparse03; +60;sparsemv.at:21;sparse files in MV archives;sparse multiv sparsemv; +61;spmvp00.at:21;sparse files in PAX MV archives, v.0.0;sparse multiv sparsemvp sparsemvp00; +62;spmvp01.at:21;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01; +63;spmvp10.at:21;sparse files in PAX MV archives, v.1.0;sparse multiv sparsemvp sparsemvp10; +64;update.at:27;update unchanged directories;update; +65;volume.at:23;volume;volume volcheck; +66;volsize.at:29;volume header size;volume volsize; +67;comprec.at:21;compressed format recognition;comprec; +68;shortfile.at:26;short input files;shortfile shortfile0; +69;shortupd.at:29;updating short archives;shortfile shortfile1 shortupd; +70;truncate.at:29;truncate;truncate filechange; +71;grow.at:24;grow;grow filechange; +72;gtarfail.at:21;gtarfail;star gtarfail; +73;gtarfail2.at:21;gtarfail2;star gtarfail2; +74;multi-fail.at:21;multi-fail;star multivolume multiv multi-fail; +75;ustar-big-2g.at:21;ustar-big-2g;star ustar-big-2g; +76;ustar-big-8g.at:21;ustar-big-8g;star ustar-big-8g; +77;pax-big-10g.at:21;pax-big-10g;star pax-big-10g; " at_prev= @@ -923,7 +926,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF -GNU tar 1.20 test suite test groups: +GNU tar 1.21 test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -947,7 +950,7 @@ _ATEOF exit 0 fi if $at_version_p; then - echo "$as_me (GNU tar 1.20)" + echo "$as_me (GNU tar 1.21)" cat <<\_ACEOF Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software @@ -1031,13 +1034,13 @@ exec 5>>"$at_suite_log" # Banners and logs. cat <<\_ASBOX ## ------------------------ ## -## GNU tar 1.20 test suite. ## +## GNU tar 1.21 test suite. ## ## ------------------------ ## _ASBOX { cat <<\_ASBOX ## ------------------------ ## -## GNU tar 1.20 test suite. ## +## GNU tar 1.21 test suite. ## ## ------------------------ ## _ASBOX echo @@ -1307,7 +1310,7 @@ fi at_failed=false $at_diff "$at_devnull" "$at_stderr" || at_failed=: -echo >>"$at_stdout"; echo "tar (GNU tar) 1.20 +echo >>"$at_stdout"; echo "tar (GNU tar) 1.21 " | $at_diff - "$at_stdout" || at_failed=: case $at_status in 77) echo 77 > "$at_status_file"; exit 77;; @@ -6799,7 +6802,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: tre: Not found in archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "en to @@ -6890,7 +6893,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: tre: Not found in archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "en to @@ -6981,7 +6984,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: tre: Not found in archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "en to @@ -7072,7 +7075,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: tre: Not found in archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "en to @@ -7163,7 +7166,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: tre: Not found in archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "en to @@ -10569,7 +10572,7 @@ at_failed=false echo >>"$at_stderr"; echo " gzip: stdin: unexpected end of file tar: Child returned status 1 -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: case $at_status in @@ -10639,7 +10642,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure )" @@ -10680,7 +10686,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure ) ) >"$at_stdout" 2>"$at_stder1" @@ -10717,7 +10726,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure ) ) >"$at_stdout" 2>"$at_stderr" @@ -10775,7 +10787,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure )" @@ -10816,7 +10831,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure ) ) >"$at_stdout" 2>"$at_stder1" @@ -10853,7 +10871,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure ) ) >"$at_stdout" 2>"$at_stderr" @@ -10911,7 +10932,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure )" @@ -10952,7 +10976,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure ) ) >"$at_stdout" 2>"$at_stder1" @@ -10989,7 +11016,10 @@ sleep 1 tar cf archive --listed=list structure tar cfv archive --listed=list structure echo separator -sleep 1 +# ReiserFS often offsets the timestamps of newly created files +# 1 second to the past. Try to compensate for it, until a better +# solution is found. +sleep 2 echo y >structure/file tar cfv archive --listed=list structure ) ) >"$at_stdout" 2>"$at_stderr" @@ -11927,7 +11957,7 @@ tar --create \\ tar tf archive.1 || exit 1 -sleep 1 +sleep 2 genfile --length 10240 --pattern zeros --file directory/file2 @@ -11969,7 +11999,7 @@ tar --create \ tar tf archive.1 || exit 1 -sleep 1 +sleep 2 genfile --length 10240 --pattern zeros --file directory/file2 @@ -12007,7 +12037,7 @@ tar --create \ tar tf archive.1 || exit 1 -sleep 1 +sleep 2 genfile --length 10240 --pattern zeros --file directory/file2 @@ -12065,7 +12095,7 @@ tar --create \\ tar tf archive.1 || exit 1 -sleep 1 +sleep 2 genfile --length 10240 --pattern zeros --file directory/file2 @@ -12107,7 +12137,7 @@ tar --create \ tar tf archive.1 || exit 1 -sleep 1 +sleep 2 genfile --length 10240 --pattern zeros --file directory/file2 @@ -12145,7 +12175,7 @@ tar --create \ tar tf archive.1 || exit 1 -sleep 1 +sleep 2 genfile --length 10240 --pattern zeros --file directory/file2 @@ -15905,10 +15935,1100 @@ echo "Begin directory listing 1" find foo | sort echo "End directory listing 1" -tar xfgv arch.2 /dev/null -echo Begin directory listing 2 -find foo | sort -echo End directory listing 2 +tar xfgv arch.2 /dev/null +echo Begin directory listing 2 +find foo | sort +echo End directory listing 2 +) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +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 foo +genfile --file foo/file1 +genfile --file foo/file2 + +mkdir foo/a +genfile --file foo/a/filea + +mkdir foo/b +genfile --file foo/b/fileb + +mkdir foo/c +genfile --file foo/c/filec + +sleep 1 + +echo "First dump" +echo "First dump">&2 +tar -g incr -cf arch.1 -v foo 2>tmperr +sort tmperr >&2 + +# Shuffle directories: +(cd foo +mv a $$ +mv c a +mv b c +mv $$ b) + +echo "Second dump" +echo "Second dump" >&2 +tar -g incr -cf arch.2 -v foo 2>tmperr +sort tmperr >&2 + +tar xfg arch.1 /dev/null + +echo "Begin directory listing 1" +find foo | sort +echo "End directory listing 1" + +tar xfgv arch.2 /dev/null +echo Begin directory listing 2 +find foo | sort +echo End directory listing 2 +) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "First dump +tar: foo/a: Directory is new +tar: foo/b: Directory is new +tar: foo/c: Directory is new +Second dump +tar: foo/a: Directory has been renamed from \`foo/c' +tar: foo/b: Directory has been renamed from \`foo/a' +tar: foo/c: Directory has been renamed from \`foo/b' +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "First dump +foo/ +foo/a/ +foo/b/ +foo/c/ +foo/file1 +foo/file2 +foo/a/filea +foo/b/fileb +foo/c/filec +Second dump +foo/ +foo/a/ +foo/b/ +foo/c/ +Begin directory listing 1 +foo +foo/a +foo/a/filea +foo/b +foo/b/fileb +foo/c +foo/c/filec +foo/file1 +foo/file2 +End directory listing 1 +foo/ +foo/a/ +foo/b/ +foo/c/ +Begin directory listing 2 +foo +foo/a +foo/a/filec +foo/b +foo/b/filea +foo/c +foo/c/fileb +foo/file1 +foo/file2 +End directory listing 2 +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/rename03.at:26: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon + + + + $at_traceoff + $at_times_p && times >"$at_times_file" + ) 5>&1 2>&1 | eval $at_tee_pipe + at_status=`cat "$at_status_file"` + ;; + + 36 ) # 36. rename04.at:27: renamed directory containing subdirectories + at_setup_line='rename04.at:27' + at_desc="renamed directory containing subdirectories" + $at_quiet $ECHO_N " 36: renamed directory containing subdirectories $ECHO_C" + at_xfail=no + test -f $XFAILFILE && at_xfail=yes + echo "# -*- compilation -*-" >> "$at_group_log" + ( + echo "36. rename04.at:27: testing ..." + $at_traceon + + + + + + $at_traceoff +echo "$at_srcdir/rename04.at:30: +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +)" +echo rename04.at:30 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/rename04.at:30: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon +$at_traceoff +echo "$at_srcdir/rename04.at:30: +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +)" +echo rename04.at:30 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/rename04.at:30: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon +$at_traceoff +echo "$at_srcdir/rename04.at:30: +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +)" +echo rename04.at:30 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/rename04.at:30: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon + + + + $at_traceoff + $at_times_p && times >"$at_times_file" + ) 5>&1 2>&1 | eval $at_tee_pipe + at_status=`cat "$at_status_file"` + ;; + + 37 ) # 37. rename05.at:24: renamed subdirectories + at_setup_line='rename05.at:24' + at_desc="renamed subdirectories" + $at_quiet $ECHO_N " 37: renamed subdirectories $ECHO_C" + at_xfail=no + test -f $XFAILFILE && at_xfail=yes + echo "# -*- compilation -*-" >> "$at_group_log" + ( + echo "37. rename05.at:24: testing ..." + $at_traceon + + + + + + $at_traceoff +echo "$at_srcdir/rename05.at:27: +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +)" +echo rename05.at:27 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir.0 +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/rename05.at:27: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon +$at_traceoff +echo "$at_srcdir/rename05.at:27: +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +)" +echo rename05.at:27 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir.0 +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/rename05.at:27: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon +$at_traceoff +echo "$at_srcdir/rename05.at:27: +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort +)" +echo rename05.at:27 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +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 + + +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file + +decho Creating initial archive +tar -cf archive.1 -g db.1 directory + +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir + +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir + +mv dir orig + +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort + +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort ) ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 @@ -15927,108 +17047,59 @@ rm -rf * test -z "`sort < /dev/null 2>&1`" || exit 77 -mkdir foo -genfile --file foo/file1 -genfile --file foo/file2 - -mkdir foo/a -genfile --file foo/a/filea - -mkdir foo/b -genfile --file foo/b/fileb - -mkdir foo/c -genfile --file foo/c/filec - -sleep 1 +decho Creating directory structure +mkdir directory +mkdir directory/subdir +genfile --file=directory/file -echo "First dump" -echo "First dump">&2 -tar -g incr -cf arch.1 -v foo 2>tmperr -sort tmperr >&2 +decho Creating initial archive +tar -cf archive.1 -g db.1 directory -# Shuffle directories: -(cd foo -mv a $$ -mv c a -mv b c -mv $$ b) +decho Renaming +mv directory/subdir directory/subdir.0 +mv directory dir -echo "Second dump" -echo "Second dump" >&2 -tar -g incr -cf arch.2 -v foo 2>tmperr -sort tmperr >&2 +decho Creating incremental archive +cp db.1 db.2 +tar -cf archive.2 -g db.2 dir -tar xfg arch.1 /dev/null +mv dir orig -echo "Begin directory listing 1" -find foo | sort -echo "End directory listing 1" +decho First restore +tar -xf archive.1 -g db.1 +find directory | sort -tar xfgv arch.2 /dev/null -echo Begin directory listing 2 -find foo | sort -echo End directory listing 2 +decho Second restore +tar -xf archive.2 -g db.2 +find dir | sort ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi at_failed=false -echo >>"$at_stderr"; echo "First dump -tar: foo/a: Directory is new -tar: foo/b: Directory is new -tar: foo/c: Directory is new -Second dump -tar: foo/a: Directory has been renamed from \`foo/c' -tar: foo/b: Directory has been renamed from \`foo/a' -tar: foo/c: Directory has been renamed from \`foo/b' +echo >>"$at_stderr"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +Second restore " | $at_diff - "$at_stderr" || at_failed=: -echo >>"$at_stdout"; echo "First dump -foo/ -foo/a/ -foo/b/ -foo/c/ -foo/file1 -foo/file2 -foo/a/filea -foo/b/fileb -foo/c/filec -Second dump -foo/ -foo/a/ -foo/b/ -foo/c/ -Begin directory listing 1 -foo -foo/a -foo/a/filea -foo/b -foo/b/fileb -foo/c -foo/c/filec -foo/file1 -foo/file2 -End directory listing 1 -foo/ -foo/a/ -foo/b/ -foo/c/ -Begin directory listing 2 -foo -foo/a -foo/a/filec -foo/b -foo/b/filea -foo/c -foo/c/fileb -foo/file1 -foo/file2 -End directory listing 2 +echo >>"$at_stdout"; echo "Creating directory structure +Creating initial archive +Renaming +Creating incremental archive +First restore +directory +directory/file +directory/subdir +Second restore +dir +dir/subdir.0 " | $at_diff - "$at_stdout" || at_failed=: case $at_status in 77) echo 77 > "$at_status_file"; exit 77;; 0) ;; - *) echo "$at_srcdir/rename03.at:26: exit code was $at_status, expected 0" + *) echo "$at_srcdir/rename05.at:27: exit code was $at_status, expected 0" at_failed=:;; esac if $at_failed; then @@ -16048,15 +17119,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 36 ) # 36. chtype.at:27: changed file types in incrementals + 38 ) # 38. chtype.at:27: changed file types in incrementals at_setup_line='chtype.at:27' at_desc="changed file types in incrementals" - $at_quiet $ECHO_N " 36: changed file types in incrementals $ECHO_C" + $at_quiet $ECHO_N " 38: changed file types in incrementals $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "36. chtype.at:27: testing ..." + echo "38. chtype.at:27: testing ..." $at_traceon @@ -16558,15 +17629,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 37 ) # 37. ignfail.at:23: ignfail + 39 ) # 39. ignfail.at:23: ignfail at_setup_line='ignfail.at:23' at_desc="ignfail" - $at_quiet $ECHO_N " 37: ignfail $ECHO_C" + $at_quiet $ECHO_N " 39: ignfail $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "37. ignfail.at:23: testing ..." + echo "39. ignfail.at:23: testing ..." $at_traceon @@ -16745,12 +17816,12 @@ fi at_failed=false echo >>"$at_stderr"; echo "----- tar: file: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: file: Warning: Cannot open: Permission denied ----- tar: directory: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: directory: Warning: Cannot open: Permission denied " | $at_diff - "$at_stderr" || at_failed=: @@ -16941,12 +18012,12 @@ fi at_failed=false echo >>"$at_stderr"; echo "----- tar: file: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: file: Warning: Cannot open: Permission denied ----- tar: directory: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: directory: Warning: Cannot open: Permission denied " | $at_diff - "$at_stderr" || at_failed=: @@ -17137,12 +18208,12 @@ fi at_failed=false echo >>"$at_stderr"; echo "----- tar: file: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: file: Warning: Cannot open: Permission denied ----- tar: directory: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: directory: Warning: Cannot open: Permission denied " | $at_diff - "$at_stderr" || at_failed=: @@ -17333,12 +18404,12 @@ fi at_failed=false echo >>"$at_stderr"; echo "----- tar: file: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: file: Warning: Cannot open: Permission denied ----- tar: directory: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: directory: Warning: Cannot open: Permission denied " | $at_diff - "$at_stderr" || at_failed=: @@ -17529,12 +18600,12 @@ fi at_failed=false echo >>"$at_stderr"; echo "----- tar: file: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: file: Warning: Cannot open: Permission denied ----- tar: directory: Cannot open: Permission denied -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors ----- tar: directory: Warning: Cannot open: Permission denied " | $at_diff - "$at_stderr" || at_failed=: @@ -17562,15 +18633,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 38 ) # 38. link01.at:33: link count gt 2 + 40 ) # 40. link01.at:33: link count gt 2 at_setup_line='link01.at:33' at_desc="link count gt 2" - $at_quiet $ECHO_N " 38: link count gt 2 $ECHO_C" + $at_quiet $ECHO_N " 40: link count gt 2 $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "38. link01.at:33: testing ..." + echo "40. link01.at:33: testing ..." $at_traceon @@ -18101,15 +19172,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 39 ) # 39. longv7.at:24: long names in V7 archives + 41 ) # 41. longv7.at:24: long names in V7 archives at_setup_line='longv7.at:24' at_desc="long names in V7 archives" - $at_quiet $ECHO_N " 39: long names in V7 archives $ECHO_C" + $at_quiet $ECHO_N " 41: long names in V7 archives $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "39. longv7.at:24: testing ..." + echo "41. longv7.at:24: testing ..." $at_traceon @@ -18185,7 +19256,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: this_is_a_very_long_name_for_a_directory_which_causes_problems/this_is_a_very_long_file_name_which_raises_issues.c: file name is too long (max 99); not dumped -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "separator this_is_a_very_long_name_for_a_directory_which_causes_problems/ @@ -18213,15 +19284,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 40 ) # 40. long01.at:28: long file names divisible by block size + 42 ) # 42. long01.at:28: long file names divisible by block size at_setup_line='long01.at:28' at_desc="long file names divisible by block size" - $at_quiet $ECHO_N " 40: long file names divisible by block size $ECHO_C" + $at_quiet $ECHO_N " 42: long file names divisible by block size $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "40. long01.at:28: testing ..." + echo "42. long01.at:28: testing ..." $at_traceon @@ -18401,15 +19472,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 41 ) # 41. lustar01.at:21: ustar: unsplittable file name + 43 ) # 43. lustar01.at:21: ustar: unsplittable file name at_setup_line='lustar01.at:21' at_desc="ustar: unsplittable file name" - $at_quiet $ECHO_N " 41: ustar: unsplittable file name $ECHO_C" + $at_quiet $ECHO_N " 43: ustar: unsplittable file name $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "41. lustar01.at:21: testing ..." + echo "43. lustar01.at:21: testing ..." $at_traceon @@ -18472,7 +19543,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: this_is_a_very_long_name_for_a_file_designed_to_test_generation_of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_between_name_and_prefix: file name is too long (cannot be split); not dumped -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: case $at_status in @@ -18498,15 +19569,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 42 ) # 42. lustar02.at:21: ustar: unsplittable path name + 44 ) # 44. lustar02.at:21: ustar: unsplittable path name at_setup_line='lustar02.at:21' at_desc="ustar: unsplittable path name" - $at_quiet $ECHO_N " 42: ustar: unsplittable path name $ECHO_C" + $at_quiet $ECHO_N " 44: ustar: unsplittable path name $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "42. lustar02.at:21: testing ..." + echo "44. lustar02.at:21: testing ..." $at_traceon @@ -18576,7 +19647,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: this_is_a_very_long_name_for_a_file_designed_to_test_generation_of_ustar_archives_by_gnu_tar_semicolon_it_will_not_fit_the_name_field_and_cannot_be_split_be/: file name is too long (cannot be split); not dumped -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: case $at_status in @@ -18602,15 +19673,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 43 ) # 43. lustar03.at:21: ustar: splitting long names + 45 ) # 45. lustar03.at:21: ustar: splitting long names at_setup_line='lustar03.at:21' at_desc="ustar: splitting long names" - $at_quiet $ECHO_N " 43: ustar: splitting long names $ECHO_C" + $at_quiet $ECHO_N " 45: ustar: splitting long names $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "43. lustar03.at:21: testing ..." + echo "45. lustar03.at:21: testing ..." $at_traceon @@ -18712,15 +19783,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 44 ) # 44. multiv01.at:23: multivolume dumps from pipes + 46 ) # 46. multiv01.at:23: multivolume dumps from pipes at_setup_line='multiv01.at:23' at_desc="multivolume dumps from pipes" - $at_quiet $ECHO_N " 44: multivolume dumps from pipes $ECHO_C" + $at_quiet $ECHO_N " 46: multivolume dumps from pipes $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "44. multiv01.at:23: testing ..." + echo "46. multiv01.at:23: testing ..." $at_traceon @@ -19190,15 +20261,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 45 ) # 45. multiv02.at:28: skipping a straddling member + 47 ) # 47. multiv02.at:28: skipping a straddling member at_setup_line='multiv02.at:28' at_desc="skipping a straddling member" - $at_quiet $ECHO_N " 45: skipping a straddling member $ECHO_C" + $at_quiet $ECHO_N " 47: skipping a straddling member $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "45. multiv02.at:28: testing ..." + echo "47. multiv02.at:28: testing ..." $at_traceon @@ -19499,15 +20570,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 46 ) # 46. multiv03.at:30: MV archive & long filenames + 48 ) # 48. multiv03.at:30: MV archive & long filenames at_setup_line='multiv03.at:30' at_desc="MV archive & long filenames" - $at_quiet $ECHO_N " 46: MV archive & long filenames $ECHO_C" + $at_quiet $ECHO_N " 48: MV archive & long filenames $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "46. multiv03.at:30: testing ..." + echo "48. multiv03.at:30: testing ..." $at_traceon @@ -19829,15 +20900,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 47 ) # 47. multiv04.at:36: split directory members in a MV archive + 49 ) # 49. multiv04.at:36: split directory members in a MV archive at_setup_line='multiv04.at:36' at_desc="split directory members in a MV archive" - $at_quiet $ECHO_N " 47: split directory members in a MV archive $ECHO_C" + $at_quiet $ECHO_N " 49: split directory members in a MV archive $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "47. multiv04.at:36: testing ..." + echo "49. multiv04.at:36: testing ..." $at_traceon @@ -20083,15 +21154,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 48 ) # 48. multiv05.at:26: Restoring after an out of sync folume + 50 ) # 50. multiv05.at:26: Restoring after an out of sync volume at_setup_line='multiv05.at:26' - at_desc="Restoring after an out of sync folume" - $at_quiet $ECHO_N " 48: Restoring after an out of sync folume $ECHO_C" + at_desc="Restoring after an out of sync volume" + $at_quiet $ECHO_N " 50: Restoring after an out of sync volume $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "48. multiv05.at:26: testing ..." + echo "50. multiv05.at:26: testing ..." $at_traceon @@ -20270,14 +21341,214 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 49 ) # 49. old.at:23: old archives + 51 ) # 51. multiv06.at:27: Multivolumes with L=record_size + at_setup_line='multiv06.at:27' + at_desc="Multivolumes with L=record_size" + $at_quiet $ECHO_N " 51: Multivolumes with L=record_size $ECHO_C" + at_xfail=no + test -f $XFAILFILE && at_xfail=yes + echo "# -*- compilation -*-" >> "$at_group_log" + ( + echo "51. multiv06.at:27: testing ..." + $at_traceon + + + + + + $at_traceoff +echo "$at_srcdir/multiv06.at:30: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + +exec <&- +decho Creating file +genfile --length 20139 --file file +decho Creating archive +tar -c -M -L10 -b20 -farc.1 -farc.2 -farc.3 file +decho Testing archive +tar -t -M -farc.1 -farc.2 -farc.3)" +echo multiv06.at:30 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + +exec <&- +decho Creating file +genfile --length 20139 --file file +decho Creating archive +tar -c -M -L10 -b20 -farc.1 -farc.2 -farc.3 file +decho Testing archive +tar -t -M -farc.1 -farc.2 -farc.3) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + +exec <&- +decho Creating file +genfile --length 20139 --file file +decho Creating archive +tar -c -M -L10 -b20 -farc.1 -farc.2 -farc.3 file +decho Testing archive +tar -t -M -farc.1 -farc.2 -farc.3) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "Creating file +Creating archive +Testing archive +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "Creating file +Creating archive +Testing archive +file +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/multiv06.at:30: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon +$at_traceoff +echo "$at_srcdir/multiv06.at:30: +mkdir pax +(cd pax +TEST_TAR_FORMAT=pax +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H pax\" +export TAR_OPTIONS +rm -rf * + +exec <&- +decho Creating file +genfile --length 20139 --file file +decho Creating archive +tar -c -M -L10 -b20 -farc.1 -farc.2 -farc.3 file +decho Testing archive +tar -t -M -farc.1 -farc.2 -farc.3)" +echo multiv06.at:30 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + echo 'Not enabling shell tracing (command contains an embedded newline)' +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; +mkdir pax +(cd pax +TEST_TAR_FORMAT=pax +export TEST_TAR_FORMAT +TAR_OPTIONS="-H pax" +export TAR_OPTIONS +rm -rf * + +exec <&- +decho Creating file +genfile --length 20139 --file file +decho Creating archive +tar -c -M -L10 -b20 -farc.1 -farc.2 -farc.3 file +decho Testing archive +tar -t -M -farc.1 -farc.2 -farc.3) ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; +mkdir pax +(cd pax +TEST_TAR_FORMAT=pax +export TEST_TAR_FORMAT +TAR_OPTIONS="-H pax" +export TAR_OPTIONS +rm -rf * + +exec <&- +decho Creating file +genfile --length 20139 --file file +decho Creating archive +tar -c -M -L10 -b20 -farc.1 -farc.2 -farc.3 file +decho Testing archive +tar -t -M -farc.1 -farc.2 -farc.3) ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +echo >>"$at_stderr"; echo "Creating file +Creating archive +Testing archive +" | $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; echo "Creating file +Creating archive +Testing archive +file +" | $at_diff - "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/multiv06.at:30: exit code was $at_status, expected 0" + at_failed=:;; +esac +if $at_failed; then + + + echo 1 > "$at_status_file" + exit 1 +fi + +$at_traceon + + + + $at_traceoff + $at_times_p && times >"$at_times_file" + ) 5>&1 2>&1 | eval $at_tee_pipe + at_status=`cat "$at_status_file"` + ;; + + 52 ) # 52. old.at:23: old archives at_setup_line='old.at:23' at_desc="old archives" - $at_quiet $ECHO_N " 49: old archives $ECHO_C" + $at_quiet $ECHO_N " 52: old archives $ECHO_C" at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "49. old.at:23: testing ..." + echo "52. old.at:23: testing ..." $at_traceon @@ -20341,15 +21612,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 50 ) # 50. recurse.at:21: recurse + 53 ) # 53. recurse.at:21: recurse at_setup_line='recurse.at:21' at_desc="recurse" - $at_quiet $ECHO_N " 50: recurse $ECHO_C" + $at_quiet $ECHO_N " 53: recurse $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "50. recurse.at:21: testing ..." + echo "53. recurse.at:21: testing ..." $at_traceon @@ -20745,15 +22016,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 51 ) # 51. same-order01.at:26: working -C with --same-order + 54 ) # 54. same-order01.at:26: working -C with --same-order at_setup_line='same-order01.at:26' at_desc="working -C with --same-order" - $at_quiet $ECHO_N " 51: working -C with --same-order $ECHO_C" + $at_quiet $ECHO_N " 54: working -C with --same-order $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "51. same-order01.at:26: testing ..." + echo "54. same-order01.at:26: testing ..." $at_traceon @@ -21274,15 +22545,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 52 ) # 52. same-order02.at:25: multiple -C options + 55 ) # 55. same-order02.at:25: multiple -C options at_setup_line='same-order02.at:25' at_desc="multiple -C options" - $at_quiet $ECHO_N " 52: multiple -C options $ECHO_C" + $at_quiet $ECHO_N " 55: multiple -C options $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "52. same-order02.at:25: testing ..." + echo "55. same-order02.at:25: testing ..." $at_traceon @@ -21823,15 +23094,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 53 ) # 53. shortrec.at:25: short records + 56 ) # 56. shortrec.at:25: short records at_setup_line='shortrec.at:25' at_desc="short records" - $at_quiet $ECHO_N " 53: short records $ECHO_C" + $at_quiet $ECHO_N " 56: short records $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "53. shortrec.at:25: testing ..." + echo "56. shortrec.at:25: testing ..." $at_traceon @@ -22282,15 +23553,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 54 ) # 54. sparse01.at:21: sparse files + 57 ) # 57. sparse01.at:21: sparse files at_setup_line='sparse01.at:21' at_desc="sparse files" - $at_quiet $ECHO_N " 54: sparse files $ECHO_C" + $at_quiet $ECHO_N " 57: sparse files $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "54. sparse01.at:21: testing ..." + echo "57. sparse01.at:21: testing ..." $at_traceon @@ -22621,15 +23892,15 @@ done at_status=`cat "$at_status_file"` ;; - 55 ) # 55. sparse02.at:21: extracting sparse file over a pipe + 58 ) # 58. sparse02.at:21: extracting sparse file over a pipe at_setup_line='sparse02.at:21' at_desc="extracting sparse file over a pipe" - $at_quiet $ECHO_N " 55: extracting sparse file over a pipe $ECHO_C" + $at_quiet $ECHO_N " 58: extracting sparse file over a pipe $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "55. sparse02.at:21: testing ..." + echo "58. sparse02.at:21: testing ..." $at_traceon @@ -22895,15 +24166,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 56 ) # 56. sparse03.at:21: storing sparse files > 8G + 59 ) # 59. sparse03.at:21: storing sparse files > 8G at_setup_line='sparse03.at:21' at_desc="storing sparse files > 8G" - $at_quiet $ECHO_N " 56: storing sparse files > 8G $ECHO_C" + $at_quiet $ECHO_N " 59: storing sparse files > 8G $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "56. sparse03.at:21: testing ..." + echo "59. sparse03.at:21: testing ..." $at_traceon @@ -23041,15 +24312,15 @@ done at_status=`cat "$at_status_file"` ;; - 57 ) # 57. sparsemv.at:21: sparse files in MV archives + 60 ) # 60. sparsemv.at:21: sparse files in MV archives at_setup_line='sparsemv.at:21' at_desc="sparse files in MV archives" - $at_quiet $ECHO_N " 57: sparse files in MV archives $ECHO_C" + $at_quiet $ECHO_N " 60: sparse files in MV archives $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "57. sparsemv.at:21: testing ..." + echo "60. sparsemv.at:21: testing ..." $at_traceon @@ -23079,18 +24350,18 @@ echo \"Pass 1: Split between data blocks\" echo \"Create archive\" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo \"Test archive\" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo \"Compare archive\" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 echo \"Pass 2: Split within a data block\" genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || exit 77 echo \"Create archive\" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo \"Test archive\" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo \"Compare archive\" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 )" echo sparsemv.at:31 >"$at_check_line_file" @@ -23115,18 +24386,18 @@ echo "Pass 1: Split between data blocks" echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 echo "Pass 2: Split within a data block" genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || exit 77 echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 ) ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 @@ -23147,18 +24418,18 @@ echo "Pass 1: Split between data blocks" echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 echo "Pass 2: Split within a data block" genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || exit 77 echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -23206,18 +24477,18 @@ echo \"Pass 1: Split between data blocks\" echo \"Create archive\" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo \"Test archive\" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo \"Compare archive\" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 echo \"Pass 2: Split within a data block\" genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || exit 77 echo \"Create archive\" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo \"Test archive\" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo \"Compare archive\" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 )" echo sparsemv.at:31 >"$at_check_line_file" @@ -23242,18 +24513,18 @@ echo "Pass 1: Split between data blocks" echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 echo "Pass 2: Split within a data block" genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || exit 77 echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 ) ) >"$at_stdout" 2>"$at_stder1" at_status=$? grep '^ *+' "$at_stder1" >&2 @@ -23274,18 +24545,18 @@ echo "Pass 1: Split between data blocks" echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 echo "Pass 2: Split within a data block" genfile --sparse --file sparsefile 0 ABCDEFGHIJ 1M ABCDEFGHI || exit 77 echo "Create archive" tar --sparse -c --record-size=512 -M -L6 -f arc.1 -f arc.2 sparsefile || exit 1 echo "Test archive" -tar -t -M -f arc.1 -f arc.2 +tar --record-size=512 -t -M -f arc.1 -f arc.2 echo "Compare archive" -tar -d -M -f arc.1 -f arc.2 +tar --record-size=512 -d -M -f arc.1 -f arc.2 ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi @@ -23326,15 +24597,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 58 ) # 58. spmvp00.at:21: sparse files in PAX MV archives, v.0.0 + 61 ) # 61. spmvp00.at:21: sparse files in PAX MV archives, v.0.0 at_setup_line='spmvp00.at:21' at_desc="sparse files in PAX MV archives, v.0.0" - $at_quiet $ECHO_N " 58: sparse files in PAX MV archives, v.0.0 $ECHO_C" + $at_quiet $ECHO_N " 61: sparse files in PAX MV archives, v.0.0 $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "58. spmvp00.at:21: testing ..." + echo "61. spmvp00.at:21: testing ..." $at_traceon @@ -23443,7 +24714,9 @@ tar -d -M -f arc.1 -f arc.2 -f arc.3 fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 12 blocks +tar: Record size = 12 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Pass 1: Split between data blocks Create archive Test archive @@ -23478,15 +24751,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 59 ) # 59. spmvp01.at:21: sparse files in PAX MV archives, v.0.1 + 62 ) # 62. spmvp01.at:21: sparse files in PAX MV archives, v.0.1 at_setup_line='spmvp01.at:21' at_desc="sparse files in PAX MV archives, v.0.1" - $at_quiet $ECHO_N " 59: sparse files in PAX MV archives, v.0.1 $ECHO_C" + $at_quiet $ECHO_N " 62: sparse files in PAX MV archives, v.0.1 $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "59. spmvp01.at:21: testing ..." + echo "62. spmvp01.at:21: testing ..." $at_traceon @@ -23595,7 +24868,9 @@ tar -d -M -f arc.1 -f arc.2 -f arc.3 fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 12 blocks +tar: Record size = 12 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Pass 1: Split between data blocks Create archive Test archive @@ -23630,15 +24905,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 60 ) # 60. spmvp10.at:21: sparse files in PAX MV archives, v.1.0 + 63 ) # 63. spmvp10.at:21: sparse files in PAX MV archives, v.1.0 at_setup_line='spmvp10.at:21' at_desc="sparse files in PAX MV archives, v.1.0" - $at_quiet $ECHO_N " 60: sparse files in PAX MV archives, v.1.0 $ECHO_C" + $at_quiet $ECHO_N " 63: sparse files in PAX MV archives, v.1.0 $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "60. spmvp10.at:21: testing ..." + echo "63. spmvp10.at:21: testing ..." $at_traceon @@ -23747,7 +25022,9 @@ tar -d -M -f arc.1 -f arc.2 -f arc.3 fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 12 blocks +tar: Record size = 12 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Pass 1: Split between data blocks Create archive Test archive @@ -23782,15 +25059,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 61 ) # 61. update.at:27: update unchanged directories + 64 ) # 64. update.at:27: update unchanged directories at_setup_line='update.at:27' at_desc="update unchanged directories" - $at_quiet $ECHO_N " 61: update unchanged directories $ECHO_C" + $at_quiet $ECHO_N " 64: update unchanged directories $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "61. update.at:27: testing ..." + echo "64. update.at:27: testing ..." $at_traceon @@ -24326,15 +25603,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 62 ) # 62. volume.at:23: volume + 65 ) # 65. volume.at:23: volume at_setup_line='volume.at:23' at_desc="volume" - $at_quiet $ECHO_N " 62: volume $ECHO_C" + $at_quiet $ECHO_N " 65: volume $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "62. volume.at:23: testing ..." + echo "65. volume.at:23: testing ..." $at_traceon @@ -24584,15 +25861,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 63 ) # 63. volsize.at:29: volume header size + 66 ) # 66. volsize.at:29: volume header size at_setup_line='volsize.at:29' at_desc="volume header size" - $at_quiet $ECHO_N " 63: volume header size $ECHO_C" + $at_quiet $ECHO_N " 66: volume header size $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "63. volsize.at:29: testing ..." + echo "66. volsize.at:29: testing ..." $at_traceon @@ -24619,7 +25896,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf \$TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv \$TEST_DATA_DIR/abc.tar +tar --utc -tvf \$TEST_DATA_DIR/abc.tar echo Extracted directory tar xf \$TEST_DATA_DIR/abc.tar find abc|sort @@ -24651,7 +25928,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -24679,7 +25956,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -24688,13 +25965,15 @@ find abc|sort fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 5 blocks +tar: Record size = 5 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Short Listing abc/not-a-file.gif abc/CCC Verbose Listing -V--------- 0/0 1536 2006-05-09 01:07 abc/not-a-file.gif--Volume Header-- --rw-r--r-- tom/users 0 2006-04-22 22:52 abc/CCC +V--------- 0/0 1536 2006-05-08 22:07 abc/not-a-file.gif--Volume Header-- +-rw-r--r-- tom/users 0 2006-04-22 19:52 abc/CCC Extracted directory abc abc/CCC @@ -24733,7 +26012,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf \$TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv \$TEST_DATA_DIR/abc.tar +tar --utc -tvf \$TEST_DATA_DIR/abc.tar echo Extracted directory tar xf \$TEST_DATA_DIR/abc.tar find abc|sort @@ -24765,7 +26044,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -24793,7 +26072,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -24802,13 +26081,15 @@ find abc|sort fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 5 blocks +tar: Record size = 5 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Short Listing abc/not-a-file.gif abc/CCC Verbose Listing -V--------- 0/0 1536 2006-05-09 01:07 abc/not-a-file.gif--Volume Header-- --rw-r--r-- tom/users 0 2006-04-22 22:52 abc/CCC +V--------- 0/0 1536 2006-05-08 22:07 abc/not-a-file.gif--Volume Header-- +-rw-r--r-- tom/users 0 2006-04-22 19:52 abc/CCC Extracted directory abc abc/CCC @@ -24847,7 +26128,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf \$TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv \$TEST_DATA_DIR/abc.tar +tar --utc -tvf \$TEST_DATA_DIR/abc.tar echo Extracted directory tar xf \$TEST_DATA_DIR/abc.tar find abc|sort @@ -24879,7 +26160,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -24907,7 +26188,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -24916,13 +26197,15 @@ find abc|sort fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 5 blocks +tar: Record size = 5 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Short Listing abc/not-a-file.gif abc/CCC Verbose Listing -V--------- 0/0 1536 2006-05-09 01:07 abc/not-a-file.gif--Volume Header-- --rw-r--r-- tom/users 0 2006-04-22 22:52 abc/CCC +V--------- 0/0 1536 2006-05-08 22:07 abc/not-a-file.gif--Volume Header-- +-rw-r--r-- tom/users 0 2006-04-22 19:52 abc/CCC Extracted directory abc abc/CCC @@ -24961,7 +26244,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf \$TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv \$TEST_DATA_DIR/abc.tar +tar --utc -tvf \$TEST_DATA_DIR/abc.tar echo Extracted directory tar xf \$TEST_DATA_DIR/abc.tar find abc|sort @@ -24993,7 +26276,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -25021,7 +26304,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -25030,13 +26313,15 @@ find abc|sort fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 5 blocks +tar: Record size = 5 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Short Listing abc/not-a-file.gif abc/CCC Verbose Listing -V--------- 0/0 1536 2006-05-09 01:07 abc/not-a-file.gif--Volume Header-- --rw-r--r-- tom/users 0 2006-04-22 22:52 abc/CCC +V--------- 0/0 1536 2006-05-08 22:07 abc/not-a-file.gif--Volume Header-- +-rw-r--r-- tom/users 0 2006-04-22 19:52 abc/CCC Extracted directory abc abc/CCC @@ -25075,7 +26360,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf \$TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv \$TEST_DATA_DIR/abc.tar +tar --utc -tvf \$TEST_DATA_DIR/abc.tar echo Extracted directory tar xf \$TEST_DATA_DIR/abc.tar find abc|sort @@ -25107,7 +26392,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -25135,7 +26420,7 @@ tarball_prereq abc.tar 540f196ceddcad9e7bd2f2d7533d0474 $TEST_DATA_DIR $TEST_DAT echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -25144,13 +26429,15 @@ find abc|sort fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo >>"$at_stderr"; echo "tar: Record size = 5 blocks +tar: Record size = 5 blocks +" | $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; echo "Short Listing abc/not-a-file.gif abc/CCC Verbose Listing -V--------- 0/0 1536 2006-05-09 01:07 abc/not-a-file.gif--Volume Header-- --rw-r--r-- tom/users 0 2006-04-22 22:52 abc/CCC +V--------- 0/0 1536 2006-05-08 22:07 abc/not-a-file.gif--Volume Header-- +-rw-r--r-- tom/users 0 2006-04-22 19:52 abc/CCC Extracted directory abc abc/CCC @@ -25178,15 +26465,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 64 ) # 64. comprec.at:21: compressed format recognition + 67 ) # 67. comprec.at:21: compressed format recognition at_setup_line='comprec.at:21' at_desc="compressed format recognition" - $at_quiet $ECHO_N " 64: compressed format recognition $ECHO_C" + $at_quiet $ECHO_N " 67: compressed format recognition $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "64. comprec.at:21: testing ..." + echo "67. comprec.at:21: testing ..." $at_traceon @@ -25683,15 +26970,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 65 ) # 65. shortfile.at:26: short input files + 68 ) # 68. shortfile.at:26: short input files at_setup_line='shortfile.at:26' at_desc="short input files" - $at_quiet $ECHO_N " 65: short input files $ECHO_C" + $at_quiet $ECHO_N " 68: short input files $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "65. shortfile.at:26: testing ..." + echo "68. shortfile.at:26: testing ..." $at_traceon @@ -25752,7 +27039,7 @@ fi at_failed=false echo >>"$at_stderr"; echo "tar: This does not look like a tar archive -tar: Error exit delayed from previous errors +tar: Exiting with failure status due to previous errors " | $at_diff - "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: case $at_status in @@ -25778,15 +27065,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 66 ) # 66. shortupd.at:29: updating short archives + 69 ) # 69. shortupd.at:29: updating short archives at_setup_line='shortupd.at:29' at_desc="updating short archives" - $at_quiet $ECHO_N " 66: updating short archives $ECHO_C" + $at_quiet $ECHO_N " 69: updating short archives $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "66. shortupd.at:29: testing ..." + echo "69. shortupd.at:29: testing ..." $at_traceon @@ -26147,15 +27434,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 67 ) # 67. truncate.at:29: truncate + 70 ) # 70. truncate.at:29: truncate at_setup_line='truncate.at:29' at_desc="truncate" - $at_quiet $ECHO_N " 67: truncate $ECHO_C" + $at_quiet $ECHO_N " 70: truncate $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "67. truncate.at:29: testing ..." + echo "70. truncate.at:29: testing ..." $at_traceon @@ -26631,15 +27918,15 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 68 ) # 68. grow.at:24: grow + 71 ) # 71. grow.at:24: grow at_setup_line='grow.at:24' at_desc="grow" - $at_quiet $ECHO_N " 68: grow $ECHO_C" + $at_quiet $ECHO_N " 71: grow $ECHO_C" at_xfail=no test -f $XFAILFILE && at_xfail=yes echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "68. grow.at:24: testing ..." + echo "71. grow.at:24: testing ..." $at_traceon @@ -27045,14 +28332,14 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 69 ) # 69. gtarfail.at:21: gtarfail + 72 ) # 72. gtarfail.at:21: gtarfail at_setup_line='gtarfail.at:21' at_desc="gtarfail" - $at_quiet $ECHO_N " 69: gtarfail $ECHO_C" + $at_quiet $ECHO_N " 72: gtarfail $ECHO_C" at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "69. gtarfail.at:21: testing ..." + echo "72. gtarfail.at:21: testing ..." $at_traceon @@ -27130,14 +28417,14 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 70 ) # 70. gtarfail2.at:21: gtarfail2 + 73 ) # 73. gtarfail2.at:21: gtarfail2 at_setup_line='gtarfail2.at:21' at_desc="gtarfail2" - $at_quiet $ECHO_N " 70: gtarfail2 $ECHO_C" + $at_quiet $ECHO_N " 73: gtarfail2 $ECHO_C" at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "70. gtarfail2.at:21: testing ..." + echo "73. gtarfail2.at:21: testing ..." $at_traceon @@ -27216,14 +28503,14 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 71 ) # 71. multi-fail.at:21: multi-fail + 74 ) # 74. multi-fail.at:21: multi-fail at_setup_line='multi-fail.at:21' at_desc="multi-fail" - $at_quiet $ECHO_N " 71: multi-fail $ECHO_C" + $at_quiet $ECHO_N " 74: multi-fail $ECHO_C" at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "71. multi-fail.at:21: testing ..." + echo "74. multi-fail.at:21: testing ..." $at_traceon @@ -27362,14 +28649,14 @@ $at_traceon at_status=`cat "$at_status_file"` ;; - 72 ) # 72. ustar-big-2g.at:21: ustar-big-2g + 75 ) # 75. ustar-big-2g.at:21: ustar-big-2g at_setup_line='ustar-big-2g.at:21' at_desc="ustar-big-2g" - $at_quiet $ECHO_N " 72: ustar-big-2g $ECHO_C" + $at_quiet $ECHO_N " 75: ustar-big-2g $ECHO_C" at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "72. ustar-big-2g.at:21: testing ..." + echo "75. ustar-big-2g.at:21: testing ..." $at_traceon @@ -27465,14 +28752,14 @@ done at_status=`cat "$at_status_file"` ;; - 73 ) # 73. ustar-big-8g.at:21: ustar-big-8g + 76 ) # 76. ustar-big-8g.at:21: ustar-big-8g at_setup_line='ustar-big-8g.at:21' at_desc="ustar-big-8g" - $at_quiet $ECHO_N " 73: ustar-big-8g $ECHO_C" + $at_quiet $ECHO_N " 76: ustar-big-8g $ECHO_C" at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "73. ustar-big-8g.at:21: testing ..." + echo "76. ustar-big-8g.at:21: testing ..." $at_traceon @@ -27568,14 +28855,14 @@ done at_status=`cat "$at_status_file"` ;; - 74 ) # 74. pax-big-10g.at:21: pax-big-10g + 77 ) # 77. pax-big-10g.at:21: pax-big-10g at_setup_line='pax-big-10g.at:21' at_desc="pax-big-10g" - $at_quiet $ECHO_N " 74: pax-big-10g $ECHO_C" + $at_quiet $ECHO_N " 77: pax-big-10g $ECHO_C" at_xfail=no echo "# -*- compilation -*-" >> "$at_group_log" ( - echo "74. pax-big-10g.at:21: testing ..." + echo "77. pax-big-10g.at:21: testing ..." $at_traceon @@ -27961,7 +29248,7 @@ _ASBOX echo "Please send \`${at_testdir+${at_testdir}/}$as_me.log' and all information you think might help:" echo echo " To: " - echo " Subject: [GNU tar 1.20] $as_me:$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}$at_xpass_list${at_xpass_list:+ passed unexpectedly}" + echo " Subject: [GNU tar 1.21] $as_me:$at_fail_list${at_fail_list:+ failed${at_xpass_list:+,}}$at_xpass_list${at_xpass_list:+ passed unexpectedly}" echo if test $at_debug_p = false; then echo diff --git a/tests/testsuite.at b/tests/testsuite.at index 5b63354..2fa5392 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -138,6 +138,8 @@ m4_include([incr04.at]) m4_include([rename01.at]) m4_include([rename02.at]) m4_include([rename03.at]) +m4_include([rename04.at]) +m4_include([rename05.at]) m4_include([chtype.at]) m4_include([ignfail.at]) @@ -155,6 +157,7 @@ m4_include([multiv02.at]) m4_include([multiv03.at]) m4_include([multiv04.at]) m4_include([multiv05.at]) +m4_include([multiv06.at]) m4_include([old.at]) diff --git a/tests/volsize.at b/tests/volsize.at index c2bf12a..b8624a0 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 (C) 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ AT_TARBALL_PREREQ([abc.tar],[540f196ceddcad9e7bd2f2d7533d0474]) echo Short Listing tar tf $TEST_DATA_DIR/abc.tar echo Verbose Listing -tar tfv $TEST_DATA_DIR/abc.tar +tar --utc -tvf $TEST_DATA_DIR/abc.tar echo Extracted directory tar xf $TEST_DATA_DIR/abc.tar find abc|sort @@ -46,11 +46,14 @@ find abc|sort abc/not-a-file.gif abc/CCC Verbose Listing -V--------- 0/0 1536 2006-05-09 01:07 abc/not-a-file.gif--Volume Header-- --rw-r--r-- tom/users 0 2006-04-22 22:52 abc/CCC +V--------- 0/0 1536 2006-05-08 22:07 abc/not-a-file.gif--Volume Header-- +-rw-r--r-- tom/users 0 2006-04-22 19:52 abc/CCC Extracted directory abc abc/CCC +], +[tar: Record size = 5 blocks +tar: Record size = 5 blocks ]) AT_CLEANUP -- 2.45.2