From: Bdale Garbee Date: Thu, 18 Jun 2009 20:35:31 +0000 (-0600) Subject: Imported Upstream version 1.22 X-Git-Url: https://git.cworth.org/git?p=tar;a=commitdiff_plain;h=785cdec4450a1459fdbb90df1344b69be34e0059 Imported Upstream version 1.22 --- diff --git a/ChangeLog b/ChangeLog index 7dd05f8..41227f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2009-03-05 Sergey Poznyakoff + + * src/incremen.c: --no-recursive works with --incremental. + +2009-03-04 Sergey Poznyakoff + + Add xz support. + + * src/buffer.c, src/suffix.c: Add support for xz compression. + * src/tar.c: New option --xz, for compression/decompression using xz. + Re-assign -J as a short equivalent of --xz. + +2009-01-19 Sergey Poznyakoff + + * doc/tar.texi: Fix typo. + +2008-12-29 Sergey Poznyakoff + + * bootstrap.conf: Include size_max. + * gnulib.modules: Remove memset, rmdir. Replace strdup with + strdup-posix. Patch by Eric Blake. + * src/tar.c: Implement -I as a shorthand for --use-compress-program. + * doc/tar.texi: Document -I. + * tests/pipe.at, tests/shortrec.at: Account for eventual 'Record + size' output. + * tests/testsuite.at (AT_TAR_CHECK_HOOK): New define + (AT_TAR_WITH_HOOK, TAR_IGNREC_HOOK): New macros. + 2008-11-30 Sergey Poznyakoff * src/xheader.c: Remove duplicate inclusion of fnmatch.h. Reported diff --git a/INSTALL b/INSTALL index 8b82ade..411f387 100644 --- a/INSTALL +++ b/INSTALL @@ -159,7 +159,7 @@ Particular systems CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -174,6 +174,16 @@ and if that doesn't work, try ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -277,7 +287,7 @@ operates. `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff --git a/Makefile.in b/Makefile.in index 08ae832..3404b1a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,9 +46,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ build-aux/mdate-sh build-aux/missing build-aux/mkinstalldirs \ build-aux/texinfo.tex build-aux/ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ @@ -81,50 +82,52 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbscasecmp.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ + $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbscasecmp.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.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/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/multiarch.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/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/size_max.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/wcrtomb.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 \ @@ -167,6 +170,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -215,11 +219,14 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DIRFD = @GNULIB_DIRFD@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ @@ -254,19 +261,25 @@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LINK = @GNULIB_LINK@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ GNULIB_MBSCHR = @GNULIB_MBSCHR@ GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ GNULIB_MBSLEN = @GNULIB_MBSLEN@ GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ @@ -291,6 +304,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANDIR = @GNULIB_SCANDIR@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ @@ -318,16 +332,23 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ 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_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ATOLL = @HAVE_ATOLL@ +HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ @@ -351,7 +372,9 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ @@ -367,17 +390,25 @@ HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHMOD = @HAVE_LCHMOD@ +HAVE_LINK = @HAVE_LINK@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ +HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOWC = @HAVE_MBRTOWC@ +HAVE_MBSINIT = @HAVE_MBSINIT@ +HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_H = @HAVE_RANDOM_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_SCANDIR = @HAVE_SCANDIR@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -409,11 +440,16 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ +HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ +HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ INCLUDE_NEXT = @INCLUDE_NEXT@ +INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -432,8 +468,13 @@ LIBS = @LIBS@ LIBTAR_LIBDEPS = @LIBTAR_LIBDEPS@ LIBTAR_LTLIBDEPS = @LIBTAR_LTLIBDEPS@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_CLOSE = @LIB_CLOSE@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOCALE_FR = @LOCALE_FR@ +LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ +LOCALE_JA = @LOCALE_JA@ +LOCALE_ZH_CN = @LOCALE_ZH_CN@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -475,8 +516,10 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ +REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ @@ -496,6 +539,12 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ +REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +REPLACE_MBSINIT = @REPLACE_MBSINIT@ +REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ @@ -517,10 +566,14 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ +REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ +REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ diff --git a/NEWS b/NEWS index 41b30ea..2a6fee2 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,33 @@ -GNU tar NEWS - User visible changes. 2008-12-27 +GNU tar NEWS - User visible changes. 2009-03-05 Please send GNU tar bug reports to + +version 1.22 - Sergey Poznyakoff, 2009-03-05 + +* Support for xz compression + +Tar uses xz for compression if one of the following conditions is met: + + 1. The option --xz or -J (see below) is used. + 2. The xz binary is set as compressor using --use-compress-program option. + 3. The file name of the archive being created ends in `.xz' and + auto-compress option (-a) is used. + +Xz is used for decompression if one of the following conditions is met: + + 1. The option --xz or -J is used. + 2. The xz binary is set as compressor using --use-compress-program option. + 3. The file is recognized as xz compressed stream data. + +* Short option -J reassigned as a short equivalent of --xz + +* New option -I + +The -I option is assigned as a short equivalent for +--use-compress-program. + +* The --no-recursive option works in incremental mode. + version 1.21 - Sergey Poznyakoff, 2008-12-27 diff --git a/aclocal.m4 b/aclocal.m4 index af762e3..94ffea2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -44,75 +44,6 @@ AC_DEFUN([AC_ISC_POSIX], ] ) -# size_max.m4 serial 6 -dnl Copyright (C) 2003, 2005-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. - -AC_DEFUN([gl_SIZE_MAX], -[ - AC_CHECK_HEADERS(stdint.h) - dnl First test whether the system already has SIZE_MAX. - AC_MSG_CHECKING([for SIZE_MAX]) - AC_CACHE_VAL([gl_cv_size_max], [ - gl_cv_size_max= - AC_EGREP_CPP([Found it], [ -#include -#if HAVE_STDINT_H -#include -#endif -#ifdef SIZE_MAX -Found it -#endif -], gl_cv_size_max=yes) - if test -z "$gl_cv_size_max"; then - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider - dnl than the type 'unsigned long'. Try hard to find a definition that can - dnl be used in a preprocessor #if, i.e. doesn't contain a cast. - AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1], - [#include -#include ], size_t_bits_minus_1=) - AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)], - [#include ], fits_in_uint=) - if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then - if test $fits_in_uint = 1; then - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. - AC_TRY_COMPILE([#include - extern size_t foo; - extern unsigned long foo; - ], [], fits_in_uint=0) - fi - dnl We cannot use 'expr' to simplify this expression, because 'expr' - dnl works only with 'long' integers in the host environment, while we - dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. - 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 - dnl Shouldn't happen, but who knows... - gl_cv_size_max='((size_t)~(size_t)0)' - fi - fi - ]) - AC_MSG_RESULT([$gl_cv_size_max]) - if test "$gl_cv_size_max" != yes; then - AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], - [Define as the maximum value of type 'size_t', if the system doesn't define it.]) - 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])]) -]) - # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -1011,11 +942,13 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/00gnulib.m4]) m4_include([m4/alloca.m4]) m4_include([m4/argmatch.m4]) m4_include([m4/argp.m4]) m4_include([m4/backupfile.m4]) m4_include([m4/bison.m4]) +m4_include([m4/btowc.m4]) m4_include([m4/canonicalize-lgpl.m4]) m4_include([m4/chdir-long.m4]) m4_include([m4/chown.m4]) @@ -1078,6 +1011,9 @@ m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) m4_include([m4/localcharset.m4]) +m4_include([m4/locale-fr.m4]) +m4_include([m4/locale-ja.m4]) +m4_include([m4/locale-zh.m4]) m4_include([m4/longlong.m4]) m4_include([m4/lseek.m4]) m4_include([m4/lstat.m4]) @@ -1087,14 +1023,14 @@ m4_include([m4/mbchar.m4]) m4_include([m4/mbiter.m4]) m4_include([m4/mbrtowc.m4]) m4_include([m4/mbscasecmp.m4]) +m4_include([m4/mbsinit.m4]) m4_include([m4/mbstate_t.m4]) -m4_include([m4/memchr.m4]) m4_include([m4/mempcpy.m4]) m4_include([m4/memrchr.m4]) -m4_include([m4/memset.m4]) m4_include([m4/mkdtemp.m4]) m4_include([m4/mktime.m4]) m4_include([m4/modechange.m4]) +m4_include([m4/multiarch.m4]) m4_include([m4/nls.m4]) m4_include([m4/open.m4]) m4_include([m4/openat.m4]) @@ -1109,7 +1045,6 @@ m4_include([m4/rawmemchr.m4]) m4_include([m4/readlink.m4]) m4_include([m4/realloc.m4]) m4_include([m4/regex.m4]) -m4_include([m4/rmdir.m4]) m4_include([m4/rmt.m4]) m4_include([m4/rpmatch.m4]) m4_include([m4/rtapelib.m4]) @@ -1118,6 +1053,7 @@ m4_include([m4/safe-write.m4]) m4_include([m4/save-cwd.m4]) m4_include([m4/savedir.m4]) m4_include([m4/setenv.m4]) +m4_include([m4/size_max.m4]) m4_include([m4/sleep.m4]) m4_include([m4/snprintf.m4]) m4_include([m4/ssize_t.m4]) @@ -1165,6 +1101,7 @@ m4_include([m4/vasnprintf.m4]) m4_include([m4/vsnprintf.m4]) m4_include([m4/wchar.m4]) m4_include([m4/wchar_t.m4]) +m4_include([m4/wcrtomb.m4]) m4_include([m4/wctype.m4]) m4_include([m4/wcwidth.m4]) m4_include([m4/wint_t.m4]) diff --git a/build-aux/config.guess b/build-aux/config.guess index f0f0d36..e5716ee 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-09-28' +timestamp='2009-02-03' # 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 @@ -331,7 +331,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -1141,6 +1154,16 @@ EOF 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1327,6 +1350,9 @@ EOF i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/build-aux/config.sub b/build-aux/config.sub index 053e738..d546a94 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-09-08' +timestamp='2009-02-03' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -249,6 +250,7 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ @@ -279,7 +281,7 @@ case $basic_machine in | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -331,6 +333,7 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ @@ -362,7 +365,7 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ @@ -443,6 +446,10 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -1182,7 +1189,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1254,8 +1261,9 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff --git a/build-aux/missing b/build-aux/missing index 68e3a41..f359dae 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2008-12-21.33 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -87,6 +87,9 @@ Supported PROGRAM values: tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -104,15 +107,22 @@ Send bug reports to ." esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -136,7 +146,7 @@ esac # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -146,7 +156,7 @@ WARNING: \`$1' is $msg. You should only need it if touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -155,7 +165,7 @@ WARNING: \`$1' is $msg. You should only need it if touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -185,7 +195,7 @@ WARNING: \`$1' is $msg. You should only need it if while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -208,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg. fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -238,7 +248,7 @@ WARNING: \`$1' $msg. You should only need it if fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -261,7 +271,7 @@ WARNING: \`$1' is $msg. You should only need it if fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -275,11 +285,11 @@ WARNING: \`$1' is $msg. You should only need it if else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -308,7 +318,7 @@ WARNING: \`$1' is $msg. You should only need it if touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 1901d68..03c2998 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,11 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2008-10-30.07} +\def\texinfoversion{2009-01-18.17} % -% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, +% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008 Free Software Foundation, Inc. +% 2007, 2008, 2009 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -98,6 +98,9 @@ \let\ptexstar=\* \let\ptext=\t \let\ptextop=\top +{\catcode`\'=\active +\global\let\ptexquoteright'}% Math-mode def from plain.tex. +\let\ptexraggedright=\raggedright % If this character appears in an error message or help string, it % starts a new line in the output. @@ -945,6 +948,8 @@ where each line of input produces a line of output.} \catcode`>=\other \catcode`+=\other \catcode`-=\other + \catcode`\`=\other + \catcode`\'=\other } \def\pushthisfilestack{% @@ -1143,11 +1148,13 @@ where each line of input produces a line of output.} \catcode`< = \active \catcode`> = \active \catcode`+ = \active + \catcode`' = \active \gdef\mathactive{% \let^ = \ptexhat \let< = \ptexless \let> = \ptexgtr \let+ = \ptexplus + \let' = \ptexquoteright } } @@ -1329,7 +1336,10 @@ output) for that.)} \def\cmykDarkRed{0.28 1 1 0.35} \def\cmykBlack{0 0 0 1} % - \def\pdfsetcolor#1{\pdfliteral{#1 k}} + % k sets the color for filling (usual text, etc.); + % K sets the color for stroking (thin rules, e.g., normal _'s). + \def\pdfsetcolor#1{\pdfliteral{#1 k #1 K}} + % % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. \def\setcolor#1{% @@ -1568,6 +1578,10 @@ output) for that.)} \def\@{@}% \let\/=\empty \makevalueexpandable + % do we want to go so far as to use \indexnofonts instead of just + % special-casing \var here? + \def\var##1{##1}% + % \leavevmode\setcolor{\urlcolor}% \startlink attr{/Border [0 0 0]}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}% @@ -1598,6 +1612,7 @@ output) for that.)} \setcolor{\linkcolor}#1\endlink} \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} \else + % non-pdf mode \let\pdfmkdest = \gobble \let\pdfurl = \gobble \let\endlink = \relax @@ -1628,6 +1643,10 @@ output) for that.)} \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} \def\tt{\fam=\ttfam \setfontstyle{tt}} +% Unfortunately, we have to override this for titles and the like, since +% in those cases "rm" is bold. Sigh. +\def\rmisbold{\rm\def\curfontstyle{bf}} + % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf. \newfam\sffam @@ -2025,8 +2044,6 @@ end \setfont\titlesc\scbshape{10}{\magstep4}{OT1} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} \def\titleecsize{2074} % Chapter (and unnumbered) fonts (17.28pt). @@ -2158,8 +2175,6 @@ end \setfont\titlesc\scbshape{10}{\magstep4}{OT1} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 -\def\authorrm{\secrm} -\def\authortt{\sectt} \def\titleecsize{2074} % Chapter fonts (14.4pt). @@ -2291,7 +2306,7 @@ end \def\curfontsize{title}% \def\lsize{chap}\def\lllsize{subsec}% \resetmathfonts \setleading{25pt}} -\def\titlefont#1{{\titlefonts\rm #1}} +\def\titlefont#1{{\titlefonts\rmisbold #1}} \def\chapfonts{% \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc @@ -2342,6 +2357,16 @@ end \def\lsize{smaller}\def\lllsize{smaller}% \resetmathfonts \setleading{9.5pt}} +% Fonts for short table of contents. +\setfont\shortcontrm\rmshape{12}{1000}{OT1} +\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 +\setfont\shortcontsl\slshape{12}{1000}{OT1} +\setfont\shortconttt\ttshape{12}{1000}{OT1TT} + +% Define these just so they can be easily changed for other fonts. +\def\angleleft{$\langle$} +\def\angleright{$\rangle$} + % Set the fonts to use with the @small... environments. \let\smallexamplefonts = \smallfonts @@ -2355,28 +2380,128 @@ end % % By the way, for comparison, here's what fits with @example (10pt): % 8.5x11=71 smallbook=60 a4=75 a5=58 -% -% I wish the USA used A4 paper. % --karl, 24jan03. - % Set up the default fonts, so we can use them for creating boxes. % \definetextfontsizexi -% Define these so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} + +\message{markup,} + +% Check if we are currently using a typewriter font. Since all the +% Computer Modern typewriter fonts have zero interword stretch (and +% shrink), and it is reasonable to expect all typewriter fonts to have +% this property, we can check that font parameter. +% +\def\ifmonospace{\ifdim\fontdimen3\font=0pt } + +% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will +% define and register \INITMACRO to be called on markup style changes. +% \INITMACRO can check \currentmarkupstyle for the innermost +% style and the set of \ifmarkupSTYLE switches for all styles +% currently in effect. +\newif\ifmarkupvar +\newif\ifmarkupsamp +\newif\ifmarkupkey +%\newif\ifmarkupfile % @file == @samp. +%\newif\ifmarkupoption % @option == @samp. +\newif\ifmarkupcode +\newif\ifmarkupkbd +%\newif\ifmarkupenv % @env == @code. +%\newif\ifmarkupcommand % @command == @code. +\newif\ifmarkuptex % @tex (and part of @math, for now). +\newif\ifmarkupexample +\newif\ifmarkupverb +\newif\ifmarkupverbatim + +\let\currentmarkupstyle\empty + +\def\setupmarkupstyle#1{% + \csname markup#1true\endcsname + \def\currentmarkupstyle{#1}% + \markupstylesetup +} + +\let\markupstylesetup\empty + +\def\defmarkupstylesetup#1{% + \expandafter\def\expandafter\markupstylesetup + \expandafter{\markupstylesetup #1}% + \def#1% +} + +% Markup style setup for left and right quotes. +\defmarkupstylesetup\markupsetuplq{% + \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuplqdefault \else \temp \fi +} + +\defmarkupstylesetup\markupsetuprq{% + \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuprqdefault \else \temp \fi +} + +{ +\catcode`\'=\active +\catcode`\`=\active + +\gdef\markupsetuplqdefault{\let`\lq} +\gdef\markupsetuprqdefault{\let'\rq} + +\gdef\markupsetcodequoteleft{\let`\codequoteleft} +\gdef\markupsetcodequoteright{\let'\codequoteright} + +\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft} +} + +\let\markupsetuplqcode \markupsetcodequoteleft +\let\markupsetuprqcode \markupsetcodequoteright +\let\markupsetuplqexample \markupsetcodequoteleft +\let\markupsetuprqexample \markupsetcodequoteright +\let\markupsetuplqverb \markupsetcodequoteleft +\let\markupsetuprqverb \markupsetcodequoteright +\let\markupsetuplqverbatim \markupsetcodequoteleft +\let\markupsetuprqverbatim \markupsetcodequoteright + +\let\markupsetuplqsamp \markupsetnoligaturesquoteleft +\let\markupsetuplqkbd \markupsetnoligaturesquoteleft + +% Allow an option to not replace quotes with a regular directed right +% quote/apostrophe (char 0x27), but instead use the undirected quote +% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it +% the default, but it works for pasting with more pdf viewers (at least +% evince), the lilypond developers report. xpdf does work with the +% regular 0x27. +% +\def\codequoteright{% + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else \char'15 \fi + \else \char'15 \fi +} +% +% and a similar option for the left quote char vs. a grave accent. +% Modern fonts display ASCII 0x60 as a grave accent, so some people like +% the code environments to do likewise. +% +\def\codequoteleft{% + \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax + % [Knuth] pp. 380,381,391 + % \relax disables Spanish ligatures ?` and !` of \tt font. + \relax`% + \else \char'22 \fi + \else \char'22 \fi +} + +% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. +\def\noligaturesquoteleft{\relax\lq} % Count depth in font-changes, for error checks \newcount\fontdepth \fontdepth=0 -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} - %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic @@ -2391,17 +2516,22 @@ end % @var is set to this for defun arguments. \def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx} -% like \smartslanted except unconditionally use \sl. We never want +% @cite is like \smartslanted except unconditionally use \sl. We never want % ttsl for book titles, do we? \def\cite#1{{\sl #1}\futurelet\next\smartitalicx} \let\i=\smartitalic \let\slanted=\smartslanted -\let\var=\smartslanted +\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}} \let\dfn=\smartslanted \let\emph=\smartitalic -% @b, explicit bold. +% Explicit font changes: @r, @sc, undocumented @ii. +\def\r#1{{\rm #1}} % roman font +\def\sc#1{{\smallcaps#1}} % smallcaps font +\def\ii#1{{\it #1}} % italic font + +% @b, explicit bold. Also @strong. \def\b#1{{\bf #1}} \let\strong=\b @@ -2433,22 +2563,35 @@ end \catcode`@=\other \def\endofsentencespacefactor{3000}% default +% @t, explicit typewriter. \def\t#1{% {\tt \rawbackslash \plainfrenchspacing #1}% \null } -\def\samp#1{`\tclose{#1}'\null} -\setfont\keyrm\rmshape{8}{1000}{OT1} -\font\keysy=cmsy9 -\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% - \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% - \vbox{\hrule\kern-0.4pt - \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% - \kern-0.4pt\hrule}% - \kern-.06em\raise0.4pt\hbox{\angleright}}}} -\def\key #1{{\nohyphenation \uppercase{#1}}\null} -% The old definition, with no lozenge: -%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} + +% @samp. +\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} + +% definition of @key that produces a lozenge. Doesn't adjust to text size. +%\setfont\keyrm\rmshape{8}{1000}{OT1} +%\font\keysy=cmsy9 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +% \vbox{\hrule\kern-0.4pt +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +% \kern-0.4pt\hrule}% +% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +% definition of @key with no lozenge. If the current font is already +% monospace, don't change it; that way, we respect @kbdinputstyle. But +% if it isn't monospace, then use \tt. +% +\def\key#1{{\setupmarkupstyle{key}% + \nohyphenation + \ifmonospace\else\tt\fi + #1}\null} + +% ctrl is no longer a Texinfo command. \def\ctrl #1{{\tt \rawbackslash \hat}#1} % @file, @option are the same as @samp. @@ -2493,9 +2636,8 @@ end \global\let'=\rq \global\let`=\lq % default definitions % \global\def\code{\begingroup - \catcode\rquoteChar=\active \catcode\lquoteChar=\active - \let'\codequoteright \let`\codequoteleft - % + \setupmarkupstyle{code}% + % The following should really be moved into \setupmarkupstyle handlers. \catcode\dashChar=\active \catcode\underChar=\active \ifallowcodebreaks \let-\codedash @@ -2547,6 +2689,7 @@ end % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. +\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}} % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), % `example' (@kbd uses ttsl only inside of @example and friends), @@ -2568,14 +2711,14 @@ end \def\wordexample{example} \def\wordcode{code} -% Default is `distinct.' +% Default is `distinct'. \kbdinputstyle distinct \def\xkey{\key} \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}% \ifx\one\xkey\ifx\threex\three \key{#2}% -\else{\tclose{\kbdfont\look}}\fi -\else{\tclose{\kbdfont\look}}\fi} +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi} % For @indicateurl, @env, @command quotes seem unnecessary, so use \code. \let\indicateurl=\code @@ -2638,30 +2781,16 @@ end \let\email=\uref \fi -% Check if we are currently using a typewriter font. Since all the -% Computer Modern typewriter fonts have zero interword stretch (and -% shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } - % Typeset a dimension, e.g., `in' or `pt'. The only reason for the % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % \def\dmn#1{\thinspace #1} -\def\kbd#1{\def\look{#1}\expandafter\kbdfoo\look??\par} - % @l was never documented to mean ``switch to the Lisp font'', % and it is not used as such in any manual I can find. We need it for % Polish suppressed-l. --karl, 22sep96. %\def\l#1{{\li #1}\null} -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font -\def\sc#1{{\smallcaps#1}} % smallcaps font -\def\ii#1{{\it #1}} % italic font - % @acronym for "FBI", "NATO", and the like. % We print this one point size smaller, since it's intended for % all-uppercase. @@ -2687,6 +2816,44 @@ end \fi } + +\message{glyphs,} + +% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. +% +% Since these characters are used in examples, they should be an even number of +% \tt widths. Each \tt character is 1en, so two makes it 1em. +% +\def\point{$\star$} +\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} +\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} +\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} +\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} +\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} + +% The @error{} command. +% Adapted from the TeXbook's \boxit. +% +\newbox\errorbox +% +{\tentt \global\dimen0 = 3em}% Width of the box. +\dimen2 = .55pt % Thickness of rules +% The text. (`r' is open on the right, `e' somewhat less so on the left.) +\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} +% +\setbox\errorbox=\hbox to \dimen0{\hfil + \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. + \advance\hsize by -2\dimen2 % Rules. + \vbox{% + \hrule height\dimen2 + \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. + \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. + \kern3pt\vrule width\dimen2}% Space to right. + \hrule height\dimen2} + \hfil} +% +\def\error{\leavevmode\lower.7ex\copy\errorbox} + % @pounds{} is a sterling sign, which Knuth put in the CM italic font. % \def\pounds{{\it\$}} @@ -2751,8 +2918,35 @@ end \def\quotedblbase{{\ecfont \char"12}} \def\quotesinglbase{{\ecfont \char"0D}} % +% This positioning is not perfect (see the ogonek LaTeX package), but +% we have the precomposed glyphs for the most common cases. We put the +% tests to use those glyphs in the single \ogonek macro so we have fewer +% dummy definitions to worry about for index entries, etc. +% +% ogonek is also used with other letters in Lithuanian (IOU), but using +% the precomposed glyphs for those is not so easy since they aren't in +% the same EC font. +\def\ogonek#1{{% + \def\temp{#1}% + \ifx\temp\macrocharA\Aogonek + \else\ifx\temp\macrochara\aogonek + \else\ifx\temp\macrocharE\Eogonek + \else\ifx\temp\macrochare\eogonek + \else + \ecfont \setbox0=\hbox{#1}% + \ifdim\ht0=1ex\accent"0C #1% + \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}% + \fi + \fi\fi\fi\fi + }% +} +\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A} +\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a} +\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} +\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} +% \def\ecfont{% - % We can't distinguish serif/sanserif and italic/slanted, but this + % We can't distinguish serif/sans and italic/slanted, but this % is used for crude hacks anyway (like adding French and German % quotes to documents typeset with CM, where we lose kerning), so % hopefully nobody will notice/care. @@ -2880,12 +3074,9 @@ end \let\subtitlerm=\tenrm \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} -\def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines - \let\tt=\authortt} - \parseargdef\title{% \checkenv\titlepage - \leftline{\titlefonts\rm #1} + \leftline{\titlefonts\rmisbold #1} % print a rule at the page bottom also. \finishedtitlepagefalse \vskip4pt \hrule height 4pt width \hsize \vskip4pt @@ -2906,7 +3097,7 @@ end \else \checkenv\titlepage \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\authorfont \leftline{#1}}% + {\secfonts\rmisbold \leftline{#1}}% \fi } @@ -3228,9 +3419,18 @@ end \parindent=0pt \parskip=\smallskipamount \ifdim\parskip=0pt \parskip=2pt \fi + % + % Try typesetting the item mark that if the document erroneously says + % something like @itemize @samp (intending @table), there's an error + % right away at the @itemize. It's not the best error message in the + % world, but it's better than leaving it to the @item. This means if + % the user wants an empty mark, they have to say @w{} not just @w. \def\itemcontents{#1}% + \setbox0 = \hbox{\itemcontents}% + % % @itemize with no arg is equivalent to @itemize @bullet. \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi + % \let\item=\itemizeitem } @@ -3251,6 +3451,7 @@ end \ifnum\lastpenalty<10000 \parskip=0in \fi \noindent \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% + % \vadjust{\penalty 1200}}% not good to break after first line of item. \flushcr } @@ -3472,12 +3673,19 @@ end % % @headitem starts a heading row, which we typeset in bold. % Assignments have to be global since we are inside the implicit group -% of an alignment entry. Note that \everycr resets \everytab. -\def\headitem{\checkenv\multitable \crcr \global\everytab={\bf}\the\everytab}% +% of an alignment entry. \everycr resets \everytab so we don't have to +% undo it ourselves. +\def\headitemfont{\b}% for people to use in the template row; not changeable +\def\headitem{% + \checkenv\multitable + \crcr + \global\everytab={\bf}% can't use \headitemfont since the parsing differs + \the\everytab % for the first item +}% % % A \tab used to include \hskip1sp. But then the space in a template % line is not enough. That is bad. So let's go back to just `&' until -% we encounter the problem it was intended to solve again. +% we again encounter the problem the 1sp was intended to solve. % --karl, nathan@acm.org, 20apr99. \def\tab{\checkenv\multitable &\the\everytab}% @@ -4038,6 +4246,7 @@ end \definedummyword\guilsinglright \definedummyword\expansion \definedummyword\minus + \definedummyword\ogonek \definedummyword\pounds \definedummyword\point \definedummyword\print @@ -4081,6 +4290,7 @@ end \definedummyword\v \definedummyword\H \definedummyword\dotaccent + \definedummyword\ogonek \definedummyword\ringaccent \definedummyword\tieaccent \definedummyword\ubaraccent @@ -5063,7 +5273,6 @@ end % 3) Likewise, headings look best if no \parindent is used, and % if justification is not attempted. Hence \raggedright. - \def\majorheading{% {\advance\chapheadingskip by 10pt \chapbreak }% \parsearg\chapheadingzzz @@ -5072,8 +5281,8 @@ end \def\chapheading{\chapbreak \parsearg\chapheadingzzz} \def\chapheadingzzz#1{% {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright - \rm #1\hfill}}% + \parindent=0pt\ptexraggedright + \rmisbold #1\hfill}}% \bigskip \par\penalty 200\relax \suppressfirstparagraphindent } @@ -5192,7 +5401,7 @@ end \domark % {% - \chapfonts \rm + \chapfonts \rmisbold % % Have to define \lastsection before calling \donoderef, because the % xref code eventually uses it. On the other hand, it has to be called @@ -5229,7 +5438,7 @@ end % % Typeset the actual heading. \nobreak % Avoid page breaks at the interline glue. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright + \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright \hangindent=\wd0 \centerparametersmaybe \unhbox0 #1\par}% }% @@ -5253,8 +5462,8 @@ end % \def\unnchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 - \parindent=0pt\raggedright - \rm #1\hfill}}\bigskip \par\nobreak + \parindent=0pt\ptexraggedright + \rmisbold #1\hfill}}\bigskip \par\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% @@ -5263,7 +5472,7 @@ end \def\centerchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt - \hfill {\rm #1}\hfill}}\bigskip \par\nobreak + \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak } \def\CHAPFopen{% \global\let\chapmacro=\chfopen @@ -5296,7 +5505,7 @@ end \def\sectionheading#1#2#3#4{% {% % Switch to the right set of fonts. - \csname #2fonts\endcsname \rm + \csname #2fonts\endcsname \rmisbold % \def\sectionlevel{#2}% \def\temptype{#3}% @@ -5332,6 +5541,11 @@ end \fi \fi\fi\fi % + % Go into vertical mode. Usually we'll already be there, but we + % don't want the following whatsit to end up in a preceding paragraph + % if the document didn't happen to have a blank line. + \par + % % Output the mark. Pass it through \safewhatsit, to take care of % the preceding space. \safewhatsit\domark @@ -5381,7 +5595,7 @@ end \nobreak % % Output the actual section heading. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright + \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright \hangindent=\wd0 % zero if no section number \unhbox0 #1}% }% @@ -5679,46 +5893,12 @@ end \message{environments,} % @foo ... @end foo. -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. -% -% Since these characters are used in examples, they should be an even number of -% \tt widths. Each \tt character is 1en, so two makes it 1em. -% -\def\point{$\star$} -\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} -\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} - -% The @error{} command. -% Adapted from the TeXbook's \boxit. -% -\newbox\errorbox -% -{\tentt \global\dimen0 = 3em}% Width of the box. -\dimen2 = .55pt % Thickness of rules -% The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} -% -\setbox\errorbox=\hbox to \dimen0{\hfil - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. - \advance\hsize by -2\dimen2 % Rules. - \vbox{% - \hrule height\dimen2 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. - \kern3pt\vrule width\dimen2}% Space to right. - \hrule height\dimen2} - \hfil} -% -\def\error{\leavevmode\lower.7ex\copy\errorbox} - % @tex ... @end tex escapes into raw Tex temporarily. % One exception: @ is still an escape character, so that @end tex works. % But \@ or @@ will get a plain tex @ character. \envdef\tex{% + \setupmarkupstyle{tex}% \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie @@ -5728,6 +5908,8 @@ end \catcode `\|=\other \catcode `\<=\other \catcode `\>=\other + \catcode`\`=\other + \catcode`\'=\other \escapechar=`\\ % \let\b=\ptexb @@ -5863,6 +6045,7 @@ end % This macro is called at the beginning of all the @example variants, % inside a group. +\newdimen\nonfillparindent \def\nonfillstart{% \aboveenvbreak \hfuzz = 12pt % Don't be fussy @@ -5870,7 +6053,12 @@ end \let\par = \lisppar % don't ignore blank lines \obeylines % each line of input is a line of output \parskip = 0pt + % Turn off paragraph indentation but redefine \indent to emulate + % the normal \indent. + \nonfillparindent=\parindent \parindent = 0pt + \let\indent\nonfillindent + % \emergencystretch = 0pt % don't try to avoid overfull boxes \ifx\nonarrowing\relax \advance \leftskip by \lispnarrowing @@ -5881,6 +6069,24 @@ end \let\exdent=\nofillexdent } +\begingroup +\obeyspaces +% We want to swallow spaces (but not other tokens) after the fake +% @indent in our nonfill-environments, where spaces are normally +% active and set to @tie, resulting in them not being ignored after +% @indent. +\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}% +\gdef\nonfillindentcheck{% +\ifx\temp % +\expandafter\nonfillindentgobble% +\else% +\leavevmode\nonfillindentbox% +\fi% +}% +\endgroup +\def\nonfillindentgobble#1{\nonfillindent} +\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}} + % If you want all examples etc. small: @set dispenvsize small. % If you want even small examples the full size: @set dispenvsize nosmall. % This affects the following displayed environments: @@ -5929,7 +6135,7 @@ end % \maketwodispenvs {lisp}{example}{% \nonfillstart - \tt\quoteexpand + \tt\setupmarkupstyle{example}% \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. \gobble % eat return } @@ -5967,6 +6173,30 @@ end \let\Eflushright = \afterenvbreak +% @raggedright does more-or-less normal line breaking but no right +% justification. From plain.tex. +\envdef\raggedright{% + \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax +} +\let\Eraggedright\par + +\envdef\raggedleft{% + \parindent=0pt \leftskip0pt plus2em + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt + \hbadness=10000 % Last line will usually be underfull, so turn off + % badness reporting. +} +\let\Eraggedleft\par + +\envdef\raggedcenter{% + \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt + \hbadness=10000 % Last line will usually be underfull, so turn off + % badness reporting. +} +\let\Eraggedcenter\par + + % @quotation does normal linebreaking (hence we can't use \nonfillstart) % and narrows the margins. We keep \parskip nonzero in general, since % we're doing normal filling. So, when using \aboveenvbreak and @@ -6033,6 +6263,10 @@ end \do\ \do\\\do\{\do\}\do\$\do\&% \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% \do\<\do\>\do\|\do\@\do+\do\"% + % Don't do the quotes -- if we do, @set txicodequoteundirected and + % @set txicodequotebacktick will not have effect on @verb and + % @verbatim, and ?` and !` ligatures won't get disabled. + %\do\`\do\'% } % % [Knuth] p. 380 @@ -6050,7 +6284,7 @@ end \def\setupverb{% \tt % easiest (and conventionally used) font for verbatim \def\par{\leavevmode\endgraf}% - \catcode`\`=\active + \setupmarkupstyle{verb}% \tabeightspaces % Respect line breaks, % print special symbols as themselves, and @@ -6065,33 +6299,6 @@ end \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % \def\starttabbox{\setbox0=\hbox\bgroup} - -% Allow an option to not replace quotes with a regular directed right -% quote/apostrophe (char 0x27), but instead use the undirected quote -% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it -% the default, but it works for pasting with more pdf viewers (at least -% evince), the lilypond developers report. xpdf does work with the -% regular 0x27. -% -\def\codequoteright{% - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else \char'15 \fi - \else \char'15 \fi -} -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. -% -\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 -} % \begingroup \catcode`\^^I=\active @@ -6105,13 +6312,6 @@ end \wd0=\dimen0 \box0 \starttabbox }% } - \catcode`\'=\active - \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}% - % - \catcode`\`=\active - \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}% - % - \gdef\quoteexpand{\rquoteexpand \lquoteexpand}% \endgroup % start the verbatim environment. @@ -6121,9 +6321,8 @@ end % Easiest (and conventionally used) font for verbatim \tt \def\par{\leavevmode\egroup\box0\endgraf}% - \catcode`\`=\active \tabexpand - \quoteexpand + \setupmarkupstyle{verbatim}% % Respect line breaks, % print special symbols as themselves, and % make each space count @@ -6462,7 +6661,7 @@ end % % On the other hand, if an argument has two dashes (for instance), we % want a way to get ttsl. Let's try @var for that. - \let\var=\ttslanted + \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% #1% \sl\hyphenchar\font=45 } @@ -7911,7 +8110,7 @@ directory should work if nowhere else does.} \gdef^^a8{\"{}} \gdef^^a9{\copyright} \gdef^^aa{\ordf} - \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^ab{\guillemetleft} \gdef^^ac{$\lnot$} \gdef^^ad{\-} \gdef^^ae{\registeredsymbol} @@ -7930,7 +8129,7 @@ directory should work if nowhere else does.} \gdef^^b9{$^1$} \gdef^^ba{\ordm} % - \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^bb{\guilletright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} \gdef^^be{$3\over4$} @@ -8023,7 +8222,7 @@ directory should work if nowhere else does.} % Latin2 (ISO-8859-2) character definitions. \def\lattwochardefs{% \gdef^^a0{~} - \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}} + \gdef^^a1{\ogonek{A}} \gdef^^a2{\u{}} \gdef^^a3{\L} \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} @@ -8040,8 +8239,8 @@ directory should work if nowhere else does.} \gdef^^af{\dotaccent Z} % \gdef^^b0{\textdegree} - \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}} - \gdef^^b2{\missingcharmsg{OGONEK}} + \gdef^^b1{\ogonek{a}} + \gdef^^b2{\ogonek{ }} \gdef^^b3{\l} \gdef^^b4{\'{}} \gdef^^b5{\v l} @@ -8066,7 +8265,7 @@ directory should work if nowhere else does.} \gdef^^c7{\cedilla C} \gdef^^c8{\v C} \gdef^^c9{\'E} - \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}} + \gdef^^ca{\ogonek{E}} \gdef^^cb{\"E} \gdef^^cc{\v E} \gdef^^cd{\'I} @@ -8100,7 +8299,7 @@ directory should work if nowhere else does.} \gdef^^e7{\cedilla c} \gdef^^e8{\v c} \gdef^^e9{\'e} - \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}} + \gdef^^ea{\ogonek{e}} \gdef^^eb{\"e} \gdef^^ec{\v e} \gdef^^ed{\'\i} @@ -8329,10 +8528,14 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0101}{\=a} \DeclareUnicodeCharacter{0102}{\u{A}} \DeclareUnicodeCharacter{0103}{\u{a}} + \DeclareUnicodeCharacter{0104}{\ogonek{A}} + \DeclareUnicodeCharacter{0105}{\ogonek{a}} \DeclareUnicodeCharacter{0106}{\'C} \DeclareUnicodeCharacter{0107}{\'c} \DeclareUnicodeCharacter{0108}{\^C} \DeclareUnicodeCharacter{0109}{\^c} + \DeclareUnicodeCharacter{0118}{\ogonek{E}} + \DeclareUnicodeCharacter{0119}{\ogonek{e}} \DeclareUnicodeCharacter{010A}{\dotaccent{C}} \DeclareUnicodeCharacter{010B}{\dotaccent{c}} \DeclareUnicodeCharacter{010C}{\v{C}} @@ -8480,6 +8683,8 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{0233}{\=y} \DeclareUnicodeCharacter{0237}{\dotless{j}} + \DeclareUnicodeCharacter{02DB}{\ogonek{ }} + \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} @@ -8861,6 +9066,9 @@ directory should work if nowhere else does.} \message{and turning on texinfo input format.} +% DEL is a comment character, in case @c does not suffice. +\catcode`\^^? = 14 + % Define macros to output various characters with catcode for normal text. \catcode`\"=\other \catcode`\~=\other @@ -8982,6 +9190,8 @@ directory should work if nowhere else does.} @let>=@normalgreater @let+=@normalplus @let$=@normaldollar %$ font-lock fix + @markupsetuplqdefault + @markupsetuprqdefault @unsepspaces } @@ -9020,9 +9230,10 @@ directory should work if nowhere else does.} @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 +@catcode`@'=@active +@catcode`@`=@active +@markupsetuplqdefault +@markupsetuprqdefault @c Local variables: @c eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/config.hin b/config.hin index 3607fc1..6db767a 100644 --- a/config.hin +++ b/config.hin @@ -1,5 +1,9 @@ /* config.hin. Generated from configure.ac by autoheader. */ +/* Define if the compiler is building for multiple architectures of Apple + platforms at once. */ +#undef AA_APPLE_UNIVERSAL_BUILD + /* Define to the number of bits in type 'ptrdiff_t'. */ #undef BITSIZEOF_PTRDIFF_T @@ -127,9 +131,6 @@ */ #undef HAVE_ALLOCA_H -/* Define to 1 if you have the header file. */ -#undef HAVE_BP_SYM_H - /* Define to 1 if you have the `btowc' function. */ #undef HAVE_BTOWC @@ -495,7 +496,7 @@ /* Define if the 'malloc' function is POSIX compliant. */ #undef HAVE_MALLOC_POSIX -/* Define to 1 if you have the `mbrtowc' function. */ +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #undef HAVE_MBRTOWC /* Define to 1 if you have the `mbsinit' function. */ @@ -507,9 +508,6 @@ /* Define to 1 if declares mbstate_t. */ #undef HAVE_MBSTATE_T -/* Define to 1 if you have the `memchr' function. */ -#undef HAVE_MEMCHR - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -519,9 +517,6 @@ /* Define to 1 if you have the `memrchr' function. */ #undef HAVE_MEMRCHR -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - /* Define to 1 if you have the `mkdirat' function. */ #undef HAVE_MKDIRAT @@ -576,6 +571,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_RANDOM_H + /* Define to 1 if you have the `rawmemchr' function. */ #undef HAVE_RAWMEMCHR @@ -585,9 +583,6 @@ /* Define if the 'realloc' function is POSIX compliant. */ #undef HAVE_REALLOC_POSIX -/* Define to 1 if you have the `rmdir' function. */ -#undef HAVE_RMDIR - /* Define to 1 if you have the `rpmatch' function. */ #undef HAVE_RPMATCH @@ -932,6 +927,15 @@ /* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */ #undef MALLOC_0_IS_NONNULL +/* Define if the mbrtowc function has the NULL string argument bug. */ +#undef MBRTOWC_NULL_ARG_BUG + +/* Define if the mbrtowc function does not return 0 for a NUL character. */ +#undef MBRTOWC_NUL_RETVAL_BUG + +/* Define if the mbrtowc function returns a wrong return value. */ +#undef MBRTOWC_RETVAL_BUG + /* Define to mt_model (v.g., for DG/UX), else to mt_type. */ #undef MTIO_CHECK_FIELD @@ -1066,6 +1070,9 @@ /* Define if you want regoff_t to be at least as wide POSIX requires. */ #undef _REGEX_LARGE_OFFSETS +/* Define to 500 only on HP-UX. */ +#undef _XOPEN_SOURCE + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE diff --git a/configure b/configure index f9c548b..7745cfe 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.21. +# Generated by GNU Autoconf 2.61 for GNU tar 1.22. # # 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.21' -PACKAGE_STRING='GNU tar 1.21' +PACKAGE_VERSION='1.22' +PACKAGE_STRING='GNU tar 1.22' PACKAGE_BUGREPORT='bug-tar@gnu.org' ac_unique_file="src/tar.c" @@ -696,6 +696,14 @@ am__fastdepCC_FALSE RANLIB YACC YFLAGS +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os CPP GREP EGREP @@ -706,6 +714,41 @@ GL_COND_LIBTOOL_FALSE ALLOCA ALLOCA_H GETOPT_H +GNULIB_BTOWC +GNULIB_WCTOB +GNULIB_MBSINIT +GNULIB_MBRTOWC +GNULIB_MBRLEN +GNULIB_MBSRTOWCS +GNULIB_MBSNRTOWCS +GNULIB_WCRTOMB +GNULIB_WCSRTOMBS +GNULIB_WCSNRTOMBS +GNULIB_WCWIDTH +HAVE_BTOWC +HAVE_MBSINIT +HAVE_MBRTOWC +HAVE_MBRLEN +HAVE_MBSRTOWCS +HAVE_MBSNRTOWCS +HAVE_WCRTOMB +HAVE_WCSRTOMBS +HAVE_WCSNRTOMBS +HAVE_DECL_WCTOB +HAVE_DECL_WCWIDTH +REPLACE_MBSTATE_T +REPLACE_BTOWC +REPLACE_WCTOB +REPLACE_MBSINIT +REPLACE_MBRTOWC +REPLACE_MBRLEN +REPLACE_MBSRTOWCS +REPLACE_MBSNRTOWCS +REPLACE_WCRTOMB +REPLACE_WCSRTOMBS +REPLACE_WCWIDTH +WCHAR_H +LOCALE_FR GNULIB_CHOWN GNULIB_CLOSE GNULIB_DUP2 @@ -722,6 +765,7 @@ GNULIB_GETLOGIN_R GNULIB_GETPAGESIZE GNULIB_GETUSERSHELL GNULIB_LCHOWN +GNULIB_LINK GNULIB_LSEEK GNULIB_READLINK GNULIB_SLEEP @@ -736,6 +780,7 @@ HAVE_GETDTABLESIZE HAVE_GETHOSTNAME HAVE_GETPAGESIZE HAVE_GETUSERSHELL +HAVE_LINK HAVE_READLINK HAVE_SLEEP HAVE_DECL_ENVIRON @@ -753,19 +798,16 @@ REPLACE_WRITE UNISTD_H_HAVE_WINSOCK2_H LIB_CLOCK_GETTIME GNULIB_DIRFD +GNULIB_SCANDIR +GNULIB_ALPHASORT HAVE_DECL_DIRFD +HAVE_SCANDIR +HAVE_ALPHASORT DIRENT_H INCLUDE_NEXT +INCLUDE_NEXT_AS_FIRST_DIRECTIVE PRAGMA_SYSTEM_HEADER NEXT_DIRENT_H -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os NEXT_ERRNO_H ERRNO_H EMULTIHOP_HIDDEN @@ -788,6 +830,8 @@ GNULIB_VPRINTF GNULIB_VPRINTF_POSIX GNULIB_VSNPRINTF GNULIB_VSPRINTF_POSIX +GNULIB_DPRINTF +GNULIB_VDPRINTF GNULIB_VASPRINTF GNULIB_OBSTACK_PRINTF GNULIB_OBSTACK_PRINTF_POSIX @@ -820,6 +864,10 @@ REPLACE_VSNPRINTF HAVE_DECL_VSNPRINTF REPLACE_SPRINTF REPLACE_VSPRINTF +HAVE_DPRINTF +REPLACE_DPRINTF +HAVE_VDPRINTF +REPLACE_VDPRINTF HAVE_VASPRINTF REPLACE_VASPRINTF HAVE_DECL_OBSTACK_PRINTF @@ -838,6 +886,7 @@ HAVE_DECL_GETDELIM HAVE_DECL_GETLINE REPLACE_GETLINE REPLACE_PERROR +LIB_CLOSE NEXT_FCNTL_H FCNTL_H NEXT_FLOAT_H @@ -858,17 +907,18 @@ NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H +APPLE_UNIVERSAL_BUILD BITSIZEOF_PTRDIFF_T -BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T +BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX -SIG_ATOMIC_T_SUFFIX SIZE_T_SUFFIX +SIG_ATOMIC_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H @@ -931,6 +981,9 @@ REPLACE_MKSTEMP REPLACE_PUTENV REPLACE_STRTOD VOID_UNSETENV +LOCALE_JA +LOCALE_FR_UTF8 +LOCALE_ZH_CN GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR @@ -991,6 +1044,7 @@ STDARG_H NEXT_STDARG_H NEXT_STDIO_H NEXT_STDLIB_H +HAVE_RANDOM_H HAVE_STRCASECMP HAVE_DECL_STRNCASECMP NEXT_STRING_H @@ -1010,10 +1064,6 @@ TIME_H_DEFINES_STRUCT_TIMESPEC SYS_TIME_H_DEFINES_STRUCT_TIMESPEC NEXT_UNISTD_H HAVE_UNISTD_H -GNULIB_WCWIDTH -HAVE_DECL_WCWIDTH -REPLACE_WCWIDTH -WCHAR_H HAVE_WINT_T HAVE_WCHAR_H NEXT_WCHAR_H @@ -1576,7 +1626,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.21 to adapt to many kinds of systems. +\`configure' configures GNU tar 1.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1646,7 +1696,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU tar 1.21:";; + short | recursive ) echo "Configuration of GNU tar 1.22:";; esac cat <<\_ACEOF @@ -1771,7 +1821,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU tar configure 1.21 +GNU tar configure 1.22 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1785,7 +1835,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.21, which was +It was created by GNU tar $as_me 1.22, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2082,6 +2132,7 @@ ac_func_list="$ac_func_list funlockfile" ac_header_list="$ac_header_list features.h" ac_header_list="$ac_header_list linewrap.h" ac_func_list="$ac_func_list pathconf" +ac_func_list="$ac_func_list btowc" ac_func_list="$ac_func_list canonicalize_file_name" ac_func_list="$ac_func_list getcwd" ac_func_list="$ac_func_list readlink" @@ -2090,7 +2141,6 @@ 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 float.h" -ac_func_list="$ac_func_list btowc" ac_func_list="$ac_func_list isblank" ac_func_list="$ac_func_list iswctype" ac_func_list="$ac_func_list mbsrtowcs" @@ -2107,12 +2157,12 @@ ac_func_list="$ac_func_list nanotime" ac_header_list="$ac_header_list stdint.h" ac_header_list="$ac_header_list wchar.h" ac_header_list="$ac_header_list inttypes.h" +ac_func_list="$ac_func_list lstat" +ac_func_list="$ac_func_list mbsinit" +ac_func_list="$ac_func_list mbrtowc" ac_func_list="$ac_func_list alarm" ac_func_list="$ac_func_list lchmod" ac_func_list="$ac_func_list fdopendir" -ac_func_list="$ac_func_list mbsinit" -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_header_list="$ac_header_list stdarg.h" @@ -2120,7 +2170,6 @@ 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" ac_header_list="$ac_header_list sysexits.h" ac_header_list="$ac_header_list time.h" @@ -2132,6 +2181,7 @@ 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 wcrtomb" ac_func_list="$ac_func_list iswcntrl" ac_func_list="$ac_func_list wcwidth" ac_header_list="$ac_header_list netdb.h" @@ -2562,7 +2612,7 @@ fi # Define the identity of the package. PACKAGE='tar' - VERSION='1.21' + VERSION='1.22' cat >>confdefs.h <<_ACEOF @@ -4151,6 +4201,89 @@ cat >>confdefs.h <<\_ACEOF _ACEOF +# 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 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4789,6 +4922,8 @@ done + + if test "${ac_cv_header_minix_config_h+set}" = set; then { echo "$as_me:$LINENO: checking for minix/config.h" >&5 echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; } @@ -4944,6 +5079,16 @@ _ACEOF fi + case "$host_os" in + hpux*) + +cat >>confdefs.h <<\_ACEOF +#define _XOPEN_SOURCE 500 +_ACEOF + + ;; + esac + { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 @@ -5020,6 +5165,12 @@ _ACEOF + + + + + + { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_source+set}" = set; then @@ -5491,7 +5642,6 @@ esac - # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then enableval=$enable_largefile; @@ -8089,6 +8239,7 @@ _ACEOF + # 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 @@ -9853,6 +10004,210 @@ fi + + GNULIB_BTOWC=0; + GNULIB_WCTOB=0; + GNULIB_MBSINIT=0; + GNULIB_MBRTOWC=0; + GNULIB_MBRLEN=0; + GNULIB_MBSRTOWCS=0; + GNULIB_MBSNRTOWCS=0; + GNULIB_WCRTOMB=0; + GNULIB_WCSRTOMBS=0; + GNULIB_WCSNRTOMBS=0; + GNULIB_WCWIDTH=0; + HAVE_BTOWC=1; + HAVE_MBSINIT=1; + HAVE_MBRTOWC=1; + HAVE_MBRLEN=1; + HAVE_MBSRTOWCS=1; + HAVE_MBSNRTOWCS=1; + HAVE_WCRTOMB=1; + HAVE_WCSRTOMBS=1; + HAVE_WCSNRTOMBS=1; + HAVE_DECL_WCTOB=1; + HAVE_DECL_WCWIDTH=1; + REPLACE_MBSTATE_T=0; + REPLACE_BTOWC=0; + REPLACE_WCTOB=0; + REPLACE_MBSINIT=0; + REPLACE_MBRTOWC=0; + REPLACE_MBRLEN=0; + REPLACE_MBSRTOWCS=0; + REPLACE_MBSNRTOWCS=0; + REPLACE_WCRTOMB=0; + REPLACE_WCSRTOMBS=0; + REPLACE_WCWIDTH=0; + WCHAR_H=''; + + + + + { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 +echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; } +if test "${am_cv_langinfo_codeset+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(CODESET); 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 + am_cv_langinfo_codeset=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + am_cv_langinfo_codeset=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: $am_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; } + if test $am_cv_langinfo_codeset = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LANGINFO_CODESET 1 +_ACEOF + + fi + + + + + { echo "$as_me:$LINENO: checking for a traditional french locale" >&5 +echo $ECHO_N "checking for a traditional french locale... $ECHO_C" >&6; } +if test "${gt_cv_locale_fr+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 +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () { + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +#if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +#endif +#ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +#endif + /* Check whether in the abbreviation of the second month, the second + character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only + one byte long. This excludes the UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1; + /* Check whether the decimal separator is a comma. + On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point + are nl_langinfo(RADIXCHAR) are both ".". */ + if (localeconv () ->decimal_point[0] != ',') return 1; + return 0; +} + +_ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO-8859-1 + else + # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. + if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO8859-1 + else + # Test for the HP-UX locale name. + if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.iso88591 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr + else + # None found. + gt_cv_locale_fr=none + fi + fi + fi + fi + fi + fi + rm -fr conftest* + +fi +{ echo "$as_me:$LINENO: result: $gt_cv_locale_fr" >&5 +echo "${ECHO_T}$gt_cv_locale_fr" >&6; } + LOCALE_FR=$gt_cv_locale_fr + + { echo "$as_me:$LINENO: checking whether canonicalize_file_name is declared" >&5 echo $ECHO_N "checking whether canonicalize_file_name is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_canonicalize_file_name+set}" = set; then @@ -9944,6 +10299,7 @@ fi GNULIB_GETPAGESIZE=0; GNULIB_GETUSERSHELL=0; GNULIB_LCHOWN=0; + GNULIB_LINK=0; GNULIB_LSEEK=0; GNULIB_READLINK=0; GNULIB_SLEEP=0; @@ -9958,6 +10314,7 @@ fi HAVE_GETHOSTNAME=1; HAVE_GETPAGESIZE=1; HAVE_GETUSERSHELL=1; + HAVE_LINK=1; HAVE_READLINK=1; HAVE_SLEEP=1; HAVE_DECL_ENVIRON=1; @@ -10289,7 +10646,11 @@ _ACEOF GNULIB_DIRFD=0; + GNULIB_SCANDIR=0; + GNULIB_ALPHASORT=0; HAVE_DECL_DIRFD=1; + HAVE_SCANDIR=1; + HAVE_ALPHASORT=1; DIRENT_H=''; @@ -10299,9 +10660,18 @@ echo $ECHO_N "checking whether the preprocessor supports include_next... $ECHO_C 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 + rm -rf conftestd1a conftestd1b conftestd2 + mkdir conftestd1a conftestd1b conftestd2 + cat < conftestd1a/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include_next +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat < conftestd1b/conftest.h #define DEFINED_IN_CONFTESTD1 #include #include_next @@ -10317,8 +10687,8 @@ EOF #endif #define DEFINED_IN_CONFTESTD2 EOF - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2" + gl_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" cat >conftest.$ac_ext <<_ACEOF #include _ACEOF @@ -10344,12 +10714,42 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -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=buggy +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 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$gl_save_CPPFLAGS" + rm -rf conftestd1a conftestd1b conftestd2 fi { echo "$as_me:$LINENO: result: $gl_cv_have_include_next" >&5 @@ -10357,99 +10757,24 @@ 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 + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next if test -n "$GCC"; then PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' fi else - INCLUDE_NEXT=include + if test $gl_cv_have_include_next = buggy; then + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next + else + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include + fi 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 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - @@ -10566,6 +10891,7 @@ echo "${ECHO_T}$gl_cv_header_errno_h_complete" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_errno_h='<'errno.h'>' else @@ -10585,7 +10911,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_errno_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/errno.h#{ s#.*"\(.*/errno.h\)".*#\1# s#^/[^/]#//&# @@ -11844,6 +12174,7 @@ echo "${ECHO_T}$gl_cv_header_errno_h_EOVERFLOW" >&6; } fi + { 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 @@ -12151,6 +12482,8 @@ fi GNULIB_VPRINTF_POSIX=0; GNULIB_VSNPRINTF=0; GNULIB_VSPRINTF_POSIX=0; + GNULIB_DPRINTF=0; + GNULIB_VDPRINTF=0; GNULIB_VASPRINTF=0; GNULIB_OBSTACK_PRINTF=0; GNULIB_OBSTACK_PRINTF_POSIX=0; @@ -12183,6 +12516,10 @@ fi HAVE_DECL_VSNPRINTF=1; REPLACE_SPRINTF=0; REPLACE_VSPRINTF=0; + HAVE_DPRINTF=1; + REPLACE_DPRINTF=0; + HAVE_VDPRINTF=1; + REPLACE_VDPRINTF=0; HAVE_VASPRINTF=1; REPLACE_VASPRINTF=0; HAVE_DECL_OBSTACK_PRINTF=1; @@ -12204,7 +12541,9 @@ fi -{ echo "$as_me:$LINENO: checking for mbstate_t" >&5 + + + { 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 @@ -12287,7 +12626,6 @@ _ACEOF - { echo "$as_me:$LINENO: checking whether stdin defaults to large file offsets" >&5 @@ -13313,6 +13651,7 @@ echo "${ECHO_T}$gl_cv_func_gnu_getopt" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_time_h='<'sys/time.h'>' else @@ -13332,7 +13671,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_sys_time_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/sys/time.h#{ s#.*"\(.*/sys/time.h\)".*#\1# s#^/[^/]#//&# @@ -13663,6 +14006,80 @@ _ACEOF + gl_cv_c_multiarch=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + +_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 + + arch= + prev= + for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do + if test -n "$prev"; then + case $word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$arch" || test "$arch" = "$word"; then + arch="$word" + else + gl_cv_c_multiarch=yes + fi + ;; + esac + prev= + else + if test "x$word" = "x-arch"; then + prev=arch + fi + fi + done + +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 + if test $gl_cv_c_multiarch = yes; then + +cat >>confdefs.h <<\_ACEOF +#define AA_APPLE_UNIVERSAL_BUILD 1 +_ACEOF + + APPLE_UNIVERSAL_BUILD=1 + else + APPLE_UNIVERSAL_BUILD=0 + fi + + + + if test $ac_cv_type_long_long_int = yes; then @@ -13703,6 +14120,7 @@ _ACEOF + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdint_h='<'stdint.h'>' else @@ -13722,7 +14140,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_stdint_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/stdint.h#{ s#.*"\(.*/stdint.h\)".*#\1# s#^/[^/]#//&# @@ -14123,13 +14545,12 @@ done + if test $APPLE_UNIVERSAL_BUILD = 0; then - - - for gltype in ptrdiff_t sig_atomic_t size_t wchar_t wint_t ; do + for gltype in ptrdiff_t size_t ; do { echo "$as_me:$LINENO: checking for bit size of $gltype" >&5 echo $ECHO_N "checking for bit size of $gltype... $ECHO_C" >&6; } if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then @@ -14529,18 +14950,21 @@ _ACEOF done + fi for gltype in sig_atomic_t wchar_t wint_t ; do - { echo "$as_me:$LINENO: checking whether $gltype is signed" >&5 -echo $ECHO_N "checking whether $gltype is signed... $ECHO_C" >&6; } -if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for bit size of $gltype" >&5 +echo $ECHO_N "checking for bit size of $gltype... $ECHO_C" >&6; } +if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + 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 @@ -14557,10 +14981,12 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif - int verify[2 * (($gltype) -1 < ($gltype) 0) - 1]; +#include int main () { +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= 0)]; +test_array [0] = 0 ; return 0; @@ -14583,69 +15009,9 @@ 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 - result=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - result=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - eval gl_cv_type_${gltype}_signed=\$result - -fi -ac_res=`eval echo '${'gl_cv_type_${gltype}_signed'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - eval result=\$gl_cv_type_${gltype}_signed - GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - if test "$result" = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_SIGNED_${GLTYPE} 1 -_ACEOF - - eval HAVE_SIGNED_${GLTYPE}=1 - else - eval HAVE_SIGNED_${GLTYPE}=0 - fi - done - - - gl_cv_type_ptrdiff_t_signed=yes - gl_cv_type_size_t_signed=no - - - - - - - - for gltype in ptrdiff_t sig_atomic_t size_t wchar_t wint_t ; do - { echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5 -echo $ECHO_N "checking for $gltype integer literal suffix... $ECHO_C" >&6; } -if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval gl_cv_type_${gltype}_suffix=no - eval result=\$gl_cv_type_${gltype}_signed - if test "$result" = yes; then - glsufu= - else - glsufu=u - fi - for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do - case $glsuf in - '') gltype1='int';; - l) gltype1='long int';; - ll) gltype1='long long int';; - i64) gltype1='__int64';; - u) gltype1='unsigned int';; - ul) gltype1='unsigned long int';; - ull) gltype1='unsigned long long int';; - ui64)gltype1='unsigned __int64';; - esac - cat >conftest.$ac_ext <<_ACEOF + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -14662,11 +15028,12 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif - extern $gltype foo; - extern $gltype1 foo; +#include int main () { +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)]; +test_array [0] = 0 ; return 0; @@ -14689,64 +15056,52 @@ 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 - eval gl_cv_type_${gltype}_suffix=\$glsuf + 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 - eval result=\$gl_cv_type_${gltype}_suffix - test "$result" != no && break - done -fi -ac_res=`eval echo '${'gl_cv_type_${gltype}_suffix'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - eval result=\$gl_cv_type_${gltype}_suffix - test "$result" = no && result= - eval ${GLTYPE}_SUFFIX=\$result - cat >>confdefs.h <<_ACEOF -#define ${GLTYPE}_SUFFIX $result -_ACEOF - done - - - - STDINT_H=stdint.h - fi - - - - -for ac_header in inttypes.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 + 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 -#include <$ac_header> + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) < 0)]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -14765,129 +15120,31 @@ 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_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 + 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. */ -#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 - - if test $ac_cv_header_inttypes_h = yes; then - { echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5 -echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6; } -if test "${gt_cv_inttypes_pri_broken+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 PRId32 -char *p = PRId32; -#endif + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif +#include int main () { +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= $ac_mid)]; +test_array [0] = 0 ; return 0; @@ -14910,50 +15167,58 @@ 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 - gt_cv_inttypes_pri_broken=no + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gt_cv_inttypes_pri_broken=yes + 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 -{ echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5 -echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6; } - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - -cat >>confdefs.h <<_ACEOF -#define PRI_MACROS_BROKEN 1 -_ACEOF - - PRI_MACROS_BROKEN=1 - else - PRI_MACROS_BROKEN=0 - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi -{ echo "$as_me:$LINENO: checking whether imaxabs is declared" >&5 -echo $ECHO_N "checking whether imaxabs is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_imaxabs+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +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. */ -$ac_includes_default + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include int main () { -#ifndef imaxabs - (void) imaxabs; -#endif +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $ac_mid)]; +test_array [0] = 0 ; return 0; @@ -14976,38 +15241,20 @@ 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_imaxabs=yes + ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_imaxabs=no + ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_imaxabs" >&5 -echo "${ECHO_T}$ac_cv_have_decl_imaxabs" >&6; } -if test $ac_cv_have_decl_imaxabs = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_IMAXABS 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_IMAXABS 0 -_ACEOF - - -fi - - -{ echo "$as_me:$LINENO: checking whether imaxdiv is declared" >&5 -echo $ECHO_N "checking whether imaxdiv is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_imaxdiv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +done +case $ac_lo in +?*) result=$ac_lo;; +'') result=unknown ;; +esac else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -15015,66 +15262,109 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +static long int longval () { return sizeof ($gltype) * CHAR_BIT; } +static unsigned long int ulongval () { return sizeof ($gltype) * CHAR_BIT; } +#include +#include int main () { -#ifndef imaxdiv - (void) imaxdiv; -#endif + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if ((sizeof ($gltype) * CHAR_BIT) < 0) + { + long int i = longval (); + if (i != (sizeof ($gltype) * CHAR_BIT)) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != (sizeof ($gltype) * CHAR_BIT)) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>&5 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_imaxdiv=yes + (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 + result=`cat conftest.val` else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_imaxdiv=no +( exit $ac_status ) +result=unknown fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_imaxdiv" >&5 -echo "${ECHO_T}$ac_cv_have_decl_imaxdiv" >&6; } -if test $ac_cv_have_decl_imaxdiv = yes; then +rm -f conftest.val + eval gl_cv_bitsizeof_${gltype}=\$result -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_IMAXDIV 1 +fi +ac_res=`eval echo '${'gl_cv_bitsizeof_${gltype}'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + eval result=\$gl_cv_bitsizeof_${gltype} + if test $result = unknown; then + result=0 + fi + GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + cat >>confdefs.h <<_ACEOF +#define BITSIZEOF_${GLTYPE} $result _ACEOF + eval BITSIZEOF_${GLTYPE}=\$result + done + -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_IMAXDIV 0 -_ACEOF -fi -{ echo "$as_me:$LINENO: checking whether strtoimax is declared" >&5 -echo $ECHO_N "checking whether strtoimax is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_strtoimax+set}" = set; then + + for gltype in sig_atomic_t wchar_t wint_t ; do + { echo "$as_me:$LINENO: checking whether $gltype is signed" >&5 +echo $ECHO_N "checking whether $gltype is signed... $ECHO_C" >&6; } +if { as_var=gl_cv_type_${gltype}_signed; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15083,13 +15373,21 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + + int verify[2 * (($gltype) -1 < ($gltype) 0) - 1]; int main () { -#ifndef strtoimax - (void) strtoimax; -#endif ; return 0; @@ -15112,52 +15410,88 @@ 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_strtoimax=yes + result=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_strtoimax=no + result=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strtoimax" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strtoimax" >&6; } -if test $ac_cv_have_decl_strtoimax = yes; then + eval gl_cv_type_${gltype}_signed=\$result -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOIMAX 1 +fi +ac_res=`eval echo '${'gl_cv_type_${gltype}_signed'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + eval result=\$gl_cv_type_${gltype}_signed + GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + if test "$result" = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_SIGNED_${GLTYPE} 1 _ACEOF + eval HAVE_SIGNED_${GLTYPE}=1 + else + eval HAVE_SIGNED_${GLTYPE}=0 + fi + done -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOIMAX 0 -_ACEOF + gl_cv_type_ptrdiff_t_signed=yes + gl_cv_type_size_t_signed=no + if test $APPLE_UNIVERSAL_BUILD = 0; then -fi -{ echo "$as_me:$LINENO: checking whether strtoumax is declared" >&5 -echo $ECHO_N "checking whether strtoumax is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_strtoumax+set}" = set; then + + for gltype in ptrdiff_t size_t ; do + { echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5 +echo $ECHO_N "checking for $gltype integer literal suffix... $ECHO_C" >&6; } +if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + eval gl_cv_type_${gltype}_suffix=no + eval result=\$gl_cv_type_${gltype}_signed + if test "$result" = yes; then + glsufu= + else + glsufu=u + fi + for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do + case $glsuf in + '') gltype1='int';; + l) gltype1='long int';; + ll) gltype1='long long int';; + i64) gltype1='__int64';; + u) gltype1='unsigned int';; + ul) gltype1='unsigned long int';; + ull) gltype1='unsigned long long int';; + ui64)gltype1='unsigned __int64';; + esac + 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 + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + + extern $gltype foo; + extern $gltype1 foo; int main () { -#ifndef strtoumax - (void) strtoumax; -#endif ; return 0; @@ -15180,172 +15514,85 @@ 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_strtoumax=yes + eval gl_cv_type_${gltype}_suffix=\$glsuf else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_strtoumax=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + eval result=\$gl_cv_type_${gltype}_suffix + test "$result" != no && break + done fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strtoumax" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strtoumax" >&6; } -if test $ac_cv_have_decl_strtoumax = yes; then +ac_res=`eval echo '${'gl_cv_type_${gltype}_suffix'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + eval result=\$gl_cv_type_${gltype}_suffix + test "$result" = no && result= + eval ${GLTYPE}_SUFFIX=\$result + cat >>confdefs.h <<_ACEOF +#define ${GLTYPE}_SUFFIX $result +_ACEOF -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOUMAX 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOUMAX 0 -_ACEOF - - -fi - - - - GNULIB_IMAXABS=0; - GNULIB_IMAXDIV=0; - GNULIB_STRTOIMAX=0; - GNULIB_STRTOUMAX=0; - HAVE_DECL_IMAXABS=1; - HAVE_DECL_IMAXDIV=1; - HAVE_DECL_STRTOIMAX=1; - HAVE_DECL_STRTOUMAX=1; - - - - - { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 -echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; } -if test "${am_cv_langinfo_codeset+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(CODESET); 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 - am_cv_langinfo_codeset=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_langinfo_codeset=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: $am_cv_langinfo_codeset" >&5 -echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; } - if test $am_cv_langinfo_codeset = yes; then + done -cat >>confdefs.h <<\_ACEOF -#define HAVE_LANGINFO_CODESET 1 -_ACEOF fi - { echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 -echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; } -if test "${ac_cv_gnu_library_2_1+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 __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Lucky GNU user" >/dev/null 2>&1; then - ac_cv_gnu_library_2_1=yes -else - ac_cv_gnu_library_2_1=no -fi -rm -f conftest* - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 -echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; } - - GLIBC21="$ac_cv_gnu_library_2_1" - - - - 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 + for gltype in sig_atomic_t wchar_t wint_t ; do + { echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5 +echo $ECHO_N "checking for $gltype integer literal suffix... $ECHO_C" >&6; } +if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + eval gl_cv_type_${gltype}_suffix=no + eval result=\$gl_cv_type_${gltype}_signed + if test "$result" = yes; then + glsufu= + else + glsufu=u + fi + for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do + case $glsuf in + '') gltype1='int';; + l) gltype1='long int';; + ll) gltype1='long long int';; + i64) gltype1='__int64';; + u) gltype1='unsigned int';; + ul) gltype1='unsigned long int';; + ull) gltype1='unsigned long long int';; + ui64)gltype1='unsigned __int64';; + esac + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + + extern $gltype foo; + extern $gltype1 foo; int main () { -#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - choke me - #endif ; return 0; @@ -15368,61 +15615,41 @@ 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_func_malloc_posix=yes + eval gl_cv_type_${gltype}_suffix=\$glsuf else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gl_cv_func_malloc_posix=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - + eval result=\$gl_cv_type_${gltype}_suffix + test "$result" != no && break + done fi -{ echo "$as_me:$LINENO: result: $gl_cv_func_malloc_posix" >&5 -echo "${ECHO_T}$gl_cv_func_malloc_posix" >&6; } +ac_res=`eval echo '${'gl_cv_type_${gltype}_suffix'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + eval result=\$gl_cv_type_${gltype}_suffix + test "$result" = no && result= + eval ${GLTYPE}_SUFFIX=\$result + cat >>confdefs.h <<_ACEOF +#define ${GLTYPE}_SUFFIX $result +_ACEOF + done - 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_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; - VOID_UNSETENV=0; + STDINT_H=stdint.h + fi -for ac_header in stdlib.h + + + +for ac_header in inttypes.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 @@ -15566,87 +15793,78 @@ fi done -{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 -echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then + if test $ac_cv_header_inttypes_h = yes; then + { echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5 +echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6; } +if test "${gt_cv_inttypes_pri_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - ac_cv_func_malloc_0_nonnull=no -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. */ -#if defined STDC_HEADERS || defined HAVE_STDLIB_H -# include -#else -char *malloc (); +#include +#ifdef PRId32 +char *p = PRId32; #endif int main () { -return ! malloc (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 - 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 + (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_malloc_0_nonnull=yes + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + gt_cv_inttypes_pri_broken=no 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 -( exit $ac_status ) -ac_cv_func_malloc_0_nonnull=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + gt_cv_inttypes_pri_broken=yes fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 -echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } -if test $ac_cv_func_malloc_0_nonnull = yes; then - gl_cv_func_malloc_0_nonnull=1 -else - gl_cv_func_malloc_0_nonnull=0 -fi - - +{ echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5 +echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6; } + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then cat >>confdefs.h <<_ACEOF -#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull +#define PRI_MACROS_BROKEN 1 _ACEOF + PRI_MACROS_BROKEN=1 + else + PRI_MACROS_BROKEN=0 + fi - { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5 -echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; } -if test "${gl_cv_func_mbrtowc+set}" = set; then +{ echo "$as_me:$LINENO: checking whether imaxabs is declared" >&5 +echo $ECHO_N "checking whether imaxabs is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_imaxabs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15655,27 +15873,26 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default int main () { -wchar_t wc; - char const s[] = ""; - size_t n = 1; - mbstate_t state; - return ! (sizeof state && (mbrtowc) (&wc, s, n, &state)); +#ifndef imaxabs + (void) imaxabs; +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext 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>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -15684,90 +15901,38 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_func_mbrtowc=yes + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_imaxabs=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gl_cv_func_mbrtowc=no + ac_cv_have_decl_imaxabs=no fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5 -echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6; } - if test $gl_cv_func_mbrtowc = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_imaxabs" >&5 +echo "${ECHO_T}$ac_cv_have_decl_imaxabs" >&6; } +if test $ac_cv_have_decl_imaxabs = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_MBRTOWC 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_IMAXABS 1 _ACEOF - fi +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_IMAXABS 0 +_ACEOF - GNULIB_MEMMEM=0; - GNULIB_MEMPCPY=0; - GNULIB_MEMRCHR=0; - GNULIB_RAWMEMCHR=0; - GNULIB_STPCPY=0; - GNULIB_STPNCPY=0; - GNULIB_STRCHRNUL=0; - GNULIB_STRDUP=0; - GNULIB_STRNDUP=0; - GNULIB_STRNLEN=0; - GNULIB_STRPBRK=0; - GNULIB_STRSEP=0; - GNULIB_STRSTR=0; - GNULIB_STRCASESTR=0; - GNULIB_STRTOK_R=0; - GNULIB_MBSLEN=0; - GNULIB_MBSNLEN=0; - GNULIB_MBSCHR=0; - GNULIB_MBSRCHR=0; - GNULIB_MBSSTR=0; - GNULIB_MBSCASECMP=0; - GNULIB_MBSNCASECMP=0; - GNULIB_MBSPCASECMP=0; - GNULIB_MBSCASESTR=0; - GNULIB_MBSCSPN=0; - GNULIB_MBSPBRK=0; - GNULIB_MBSSPN=0; - GNULIB_MBSSEP=0; - 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; - HAVE_DECL_STRDUP=1; - HAVE_STRNDUP=1; - HAVE_DECL_STRNDUP=1; - HAVE_DECL_STRNLEN=1; - HAVE_STRPBRK=1; - HAVE_STRSEP=1; - HAVE_STRCASESTR=1; - HAVE_DECL_STRTOK_R=1; - HAVE_DECL_STRERROR=1; - HAVE_DECL_STRSIGNAL=1; - HAVE_STRVERSCMP=1; - REPLACE_MEMMEM=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; } -if test "${ac_cv_have_decl_memrchr+set}" = set; then +fi + + +{ echo "$as_me:$LINENO: checking whether imaxdiv is declared" >&5 +echo $ECHO_N "checking whether imaxdiv is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_imaxdiv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15780,8 +15945,8 @@ $ac_includes_default int main () { -#ifndef memrchr - (void) memrchr; +#ifndef imaxdiv + (void) imaxdiv; #endif ; @@ -15805,53 +15970,37 @@ 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_memrchr=yes + ac_cv_have_decl_imaxdiv=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_memrchr=no + ac_cv_have_decl_imaxdiv=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_memrchr" >&5 -echo "${ECHO_T}$ac_cv_have_decl_memrchr" >&6; } -if test $ac_cv_have_decl_memrchr = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_imaxdiv" >&5 +echo "${ECHO_T}$ac_cv_have_decl_imaxdiv" >&6; } +if test $ac_cv_have_decl_imaxdiv = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MEMRCHR 1 +#define HAVE_DECL_IMAXDIV 1 _ACEOF else cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MEMRCHR 0 +#define HAVE_DECL_IMAXDIV 0 _ACEOF 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 +{ echo "$as_me:$LINENO: checking whether strtoimax is declared" >&5 +echo $ECHO_N "checking whether strtoimax is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_strtoimax+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15864,8 +16013,8 @@ $ac_includes_default int main () { -#ifndef snprintf - (void) snprintf; +#ifndef strtoimax + (void) strtoimax; #endif ; @@ -15889,47 +16038,37 @@ 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_snprintf=yes + ac_cv_have_decl_strtoimax=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_snprintf=no + ac_cv_have_decl_strtoimax=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5 -echo "${ECHO_T}$ac_cv_have_decl_snprintf" >&6; } -if test $ac_cv_have_decl_snprintf = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strtoimax" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strtoimax" >&6; } +if test $ac_cv_have_decl_strtoimax = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SNPRINTF 1 +#define HAVE_DECL_STRTOIMAX 1 _ACEOF else cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SNPRINTF 0 +#define HAVE_DECL_STRTOIMAX 0 _ACEOF fi - - - - - - - - HAVE_STRCASECMP=1; - HAVE_DECL_STRNCASECMP=1; - -{ echo "$as_me:$LINENO: checking whether strdup is declared" >&5 -echo $ECHO_N "checking whether strdup is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_strdup+set}" = set; then +{ echo "$as_me:$LINENO: checking whether strtoumax is declared" >&5 +echo $ECHO_N "checking whether strtoumax is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_strtoumax+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15942,8 +16081,8 @@ $ac_includes_default int main () { -#ifndef strdup - (void) strdup; +#ifndef strtoumax + (void) strtoumax; #endif ; @@ -15967,28 +16106,28 @@ 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_strdup=yes + ac_cv_have_decl_strtoumax=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_strdup=no + ac_cv_have_decl_strtoumax=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strdup" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strdup" >&6; } -if test $ac_cv_have_decl_strdup = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strtoumax" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strtoumax" >&6; } +if test $ac_cv_have_decl_strtoumax = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRDUP 1 +#define HAVE_DECL_STRTOUMAX 1 _ACEOF else cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRDUP 0 +#define HAVE_DECL_STRTOUMAX 0 _ACEOF @@ -15996,140 +16135,84 @@ fi + GNULIB_IMAXABS=0; + GNULIB_IMAXDIV=0; + GNULIB_STRTOIMAX=0; + GNULIB_STRTOUMAX=0; + HAVE_DECL_IMAXABS=1; + HAVE_DECL_IMAXDIV=1; + HAVE_DECL_STRTOIMAX=1; + HAVE_DECL_STRTOUMAX=1; - 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 "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6; } +if test "${ac_cv_gnu_library_2_1+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 cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -return !*strerror (-2); - ; - return 0; -} +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + _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_working_strerror=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Lucky GNU user" >/dev/null 2>&1; then + ac_cv_gnu_library_2_1=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_gnu_library_2_1=no +fi +rm -f conftest* + + - gl_cv_func_working_strerror=no fi +{ echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5 +echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + GLIBC21="$ac_cv_gnu_library_2_1" -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 () -{ -return !*strerror (-2); - ; - 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_func_working_strerror=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_working_strerror=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi + GNULIB_LCHMOD=0; + GNULIB_LSTAT=0; + HAVE_LCHMOD=1; + REPLACE_LSTAT=0; + REPLACE_MKDIR=0; -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 - 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; } -if test "${ac_cv_have_decl_strerror+set}" = set; then + { 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 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 - (void) strerror; -#endif +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + choke me + #endif ; return 0; @@ -16152,43 +16235,61 @@ 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_strerror=yes + gl_cv_func_malloc_posix=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_strerror=no + gl_cv_func_malloc_posix=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strerror" >&6; } -if test $ac_cv_have_decl_strerror = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRERROR 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRERROR 0 -_ACEOF - fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_malloc_posix" >&5 +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_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; + VOID_UNSETENV=0; - - - - if test $ac_cv_header_sys_socket_h != yes; then - -for ac_header in winsock2.h +for ac_header in stdlib.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 @@ -16332,14 +16433,81 @@ fi done - fi +{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 +echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } +if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ac_cv_func_malloc_0_nonnull=no +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include +#else +char *malloc (); +#endif - fi +int +main () +{ +return ! malloc (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_func_malloc_0_nonnull=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 ) +ac_cv_func_malloc_0_nonnull=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: $ac_cv_func_malloc_0_nonnull" >&5 +echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } +if test $ac_cv_func_malloc_0_nonnull = yes; then + gl_cv_func_malloc_0_nonnull=1 +else + gl_cv_func_malloc_0_nonnull=0 +fi +cat >>confdefs.h <<_ACEOF +#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull +_ACEOF @@ -16349,101 +16517,321 @@ done - if test $gl_cv_have_include_next = yes; then - gl_cv_next_string_h='<'string.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_string_h+set}" = set; then + { echo "$as_me:$LINENO: checking for a traditional japanese locale" >&5 +echo $ECHO_N "checking for a traditional japanese locale... $ECHO_C" >&6; } +if test "${gt_cv_locale_ja+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ac_cv_header_string_h = yes; then - 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. */ + +#include +#include +#if HAVE_LANGINFO_CODESET +# include +#endif +#include #include +struct tm t; +char buf[16]; +int main () +{ + const char *p; + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +#if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +#endif +#ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +#endif + /* Check whether MB_CUR_MAX is > 1. This excludes the dysfunctional locales + on Cygwin 1.5.x. */ + if (MB_CUR_MAX == 1) + return 1; + /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. + This excludes the UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; + for (p = buf; *p != '\0'; p++) + if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) + return 1; + return 0; +} _ACEOF - gl_cv_next_string_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/string.h#{ - s#.*"\(.*/string.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_string_h='<'string.h'>' - fi + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the AIX locale name. + if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC-JP + else + # Test for the HP-UX, OSF/1, NetBSD locale name. + if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.eucJP + else + # Test for the IRIX, FreeBSD locale name. + if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC + else + # Test for the Solaris 7 locale name. + if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja + else + # Special test for NetBSD 1.6. + if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then + gt_cv_locale_ja=ja_JP.eucJP + else + # None found. + gt_cv_locale_ja=none + fi + fi + fi + fi + fi + fi + fi + rm -fr conftest* fi -{ echo "$as_me:$LINENO: result: $gl_cv_next_string_h" >&5 -echo "${ECHO_T}$gl_cv_next_string_h" >&6; } - fi - NEXT_STRING_H=$gl_cv_next_string_h - - - - - +{ echo "$as_me:$LINENO: result: $gt_cv_locale_ja" >&5 +echo "${ECHO_T}$gt_cv_locale_ja" >&6; } + LOCALE_JA=$gt_cv_locale_ja + { echo "$as_me:$LINENO: checking for a french Unicode locale" >&5 +echo $ECHO_N "checking for a french Unicode locale... $ECHO_C" >&6; } +if test "${gt_cv_locale_fr_utf8+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 +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () { + /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl + imitates locale dependent behaviour by looking at the environment + variables, and all locales use the UTF-8 encoding. */ +#if !(defined __BEOS__ || defined __HAIKU__) + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +# if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +# endif +# ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +# endif + /* Check whether in the abbreviation of the second month, the second + character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is + two bytes long, with UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%b", &t) < 4 + || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') + return 1; +#endif + /* Check whether the decimal separator is a comma. + On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point + are nl_langinfo(RADIXCHAR) are both ".". */ + if (localeconv () ->decimal_point[0] != ',') return 1; + return 0; +} +_ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr.UTF-8 + else + # None found. + gt_cv_locale_fr_utf8=none + fi + fi + fi + fi + rm -fr conftest* +fi +{ echo "$as_me:$LINENO: result: $gt_cv_locale_fr_utf8" >&5 +echo "${ECHO_T}$gt_cv_locale_fr_utf8" >&6; } + LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 - if test $gl_cv_have_include_next = yes; then - gl_cv_next_strings_h='<'strings.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_strings_h+set}" = set; then + { echo "$as_me:$LINENO: checking for a transitional chinese locale" >&5 +echo $ECHO_N "checking for a transitional chinese locale... $ECHO_C" >&6; } +if test "${gt_cv_locale_zh_CN+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test $ac_cv_header_strings_h = yes; then - 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. */ -#include + +#include +#include +#include +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () +{ + const char *p; + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +#if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +#endif +#ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +#endif + /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. + This excludes the UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; + for (p = buf; *p != '\0'; p++) + if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) + return 1; + /* Check whether a typical GB18030 multibyte sequence is recognized as a + single wide character. This excludes the GB2312 and GBK encodings. */ + if (mblen ("\203\062\332\066", 5) != 4) + return 1; + return 0; +} _ACEOF - gl_cv_next_strings_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/strings.h#{ - s#.*"\(.*/strings.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_strings_h='<'strings.h'>' - fi + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the locale name without encoding suffix. + if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN.GB18030 + else + # None found. + gt_cv_locale_zh_CN=none + fi + fi + else + # If there was a link error, due to mblen(), the system is so old that + # it certainly doesn't have a chinese locale. + gt_cv_locale_zh_CN=none + fi + rm -fr conftest* fi -{ echo "$as_me:$LINENO: result: $gl_cv_next_strings_h" >&5 -echo "${ECHO_T}$gl_cv_next_strings_h" >&6; } - fi - NEXT_STRINGS_H=$gl_cv_next_strings_h - +{ echo "$as_me:$LINENO: result: $gt_cv_locale_zh_CN" >&5 +echo "${ECHO_T}$gt_cv_locale_zh_CN" >&6; } + LOCALE_ZH_CN=$gt_cv_locale_zh_CN -{ echo "$as_me:$LINENO: checking whether strndup is declared" >&5 -echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_strndup+set}" = set; then + { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5 +echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; } +if test "${ac_cv_func_mbrtowc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16452,26 +16840,27 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include int main () { -#ifndef strndup - (void) strndup; -#endif - +wchar_t wc; + char const s[] = ""; + size_t n = 1; + mbstate_t state; + return ! (sizeof state && (mbrtowc) (&wc, s, n, &state)); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -16480,38 +16869,90 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_strndup=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_mbrtowc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_strndup=no + ac_cv_func_mbrtowc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strndup" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6; } -if test $ac_cv_have_decl_strndup = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNDUP 1 -_ACEOF +{ echo "$as_me:$LINENO: result: $ac_cv_func_mbrtowc" >&5 +echo "${ECHO_T}$ac_cv_func_mbrtowc" >&6; } + if test $ac_cv_func_mbrtowc = yes; then - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNDUP 0 +cat >>confdefs.h <<\_ACEOF +#define HAVE_MBRTOWC 1 _ACEOF + fi -fi + GNULIB_MEMMEM=0; + GNULIB_MEMPCPY=0; + GNULIB_MEMRCHR=0; + GNULIB_RAWMEMCHR=0; + GNULIB_STPCPY=0; + GNULIB_STPNCPY=0; + GNULIB_STRCHRNUL=0; + GNULIB_STRDUP=0; + GNULIB_STRNDUP=0; + GNULIB_STRNLEN=0; + GNULIB_STRPBRK=0; + GNULIB_STRSEP=0; + GNULIB_STRSTR=0; + GNULIB_STRCASESTR=0; + GNULIB_STRTOK_R=0; + GNULIB_MBSLEN=0; + GNULIB_MBSNLEN=0; + GNULIB_MBSCHR=0; + GNULIB_MBSRCHR=0; + GNULIB_MBSSTR=0; + GNULIB_MBSCASECMP=0; + GNULIB_MBSNCASECMP=0; + GNULIB_MBSPCASECMP=0; + GNULIB_MBSCASESTR=0; + GNULIB_MBSCSPN=0; + GNULIB_MBSPBRK=0; + GNULIB_MBSSPN=0; + GNULIB_MBSSEP=0; + 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; + HAVE_DECL_STRDUP=1; + HAVE_STRNDUP=1; + HAVE_DECL_STRNDUP=1; + HAVE_DECL_STRNLEN=1; + HAVE_STRPBRK=1; + HAVE_STRSEP=1; + HAVE_STRCASESTR=1; + HAVE_DECL_STRTOK_R=1; + HAVE_DECL_STRERROR=1; + HAVE_DECL_STRSIGNAL=1; + HAVE_STRVERSCMP=1; + REPLACE_MEMMEM=0; + REPLACE_STRDUP=0; + REPLACE_STRSTR=0; + REPLACE_STRCASESTR=0; + REPLACE_STRERROR=0; + REPLACE_STRSIGNAL=0; -{ echo "$as_me:$LINENO: checking whether strnlen is declared" >&5 -echo $ECHO_N "checking whether strnlen is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_strnlen+set}" = set; then +{ echo "$as_me:$LINENO: checking whether memrchr is declared" >&5 +echo $ECHO_N "checking whether memrchr is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_memrchr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16524,8 +16965,8 @@ $ac_includes_default int main () { -#ifndef strnlen - (void) strnlen; +#ifndef memrchr + (void) memrchr; #endif ; @@ -16549,28 +16990,28 @@ 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_strnlen=yes + ac_cv_have_decl_memrchr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_strnlen=no + ac_cv_have_decl_memrchr=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strnlen" >&5 -echo "${ECHO_T}$ac_cv_have_decl_strnlen" >&6; } -if test $ac_cv_have_decl_strnlen = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_memrchr" >&5 +echo "${ECHO_T}$ac_cv_have_decl_memrchr" >&6; } +if test $ac_cv_have_decl_memrchr = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNLEN 1 +#define HAVE_DECL_MEMRCHR 1 _ACEOF else cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNLEN 0 +#define HAVE_DECL_MEMRCHR 0 _ACEOF @@ -16584,23 +17025,12 @@ fi - REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; - REPLACE_NANOSLEEP=GNULIB_PORTCHECK; - REPLACE_STRPTIME=GNULIB_PORTCHECK; - REPLACE_TIMEGM=GNULIB_PORTCHECK; - - - - - - - - { echo "$as_me:$LINENO: checking for struct timespec in " >&5 -echo $ECHO_N "checking for struct timespec in ... $ECHO_C" >&6; } -if test "${gl_cv_sys_struct_timespec_in_time_h+set}" = set; then +{ 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16609,68 +17039,14 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - +$ac_includes_default int main () { -static struct timespec x; x.tv_sec = x.tv_nsec; - ; - 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_sys_struct_timespec_in_time_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gl_cv_sys_struct_timespec_in_time_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $gl_cv_sys_struct_timespec_in_time_h" >&5 -echo "${ECHO_T}$gl_cv_sys_struct_timespec_in_time_h" >&6; } - - TIME_H_DEFINES_STRUCT_TIMESPEC=0 - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 - if test $gl_cv_sys_struct_timespec_in_time_h = yes; then - TIME_H_DEFINES_STRUCT_TIMESPEC=1 - else - { echo "$as_me:$LINENO: checking for struct timespec in " >&5 -echo $ECHO_N "checking for struct timespec in ... $ECHO_C" >&6; } -if test "${gl_cv_sys_struct_timespec_in_sys_time_h+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 +#ifndef snprintf + (void) snprintf; +#endif -int -main () -{ -static struct timespec x; x.tv_sec = x.tv_nsec; ; return 0; } @@ -16692,80 +17068,32 @@ 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_sys_struct_timespec_in_sys_time_h=yes + ac_cv_have_decl_snprintf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gl_cv_sys_struct_timespec_in_sys_time_h=no + ac_cv_have_decl_snprintf=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5 -echo "${ECHO_T}$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; } - if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then - SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1 - fi - fi - - - - - - - - - - - - - +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_snprintf" >&5 +echo "${ECHO_T}$ac_cv_have_decl_snprintf" >&6; } +if test $ac_cv_have_decl_snprintf = yes; then +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SNPRINTF 1 +_ACEOF - if test $gl_cv_have_include_next = yes; then - gl_cv_next_time_h='<'time.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_time_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - - if test $ac_cv_header_time_h = yes; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_SNPRINTF 0 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF - gl_cv_next_time_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/time.h#{ - s#.*"\(.*/time.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_time_h='<'time.h'>' - fi fi -{ echo "$as_me:$LINENO: result: $gl_cv_next_time_h" >&5 -echo "${ECHO_T}$gl_cv_next_time_h" >&6; } - fi - NEXT_TIME_H=$gl_cv_next_time_h - - - - - - - @@ -16775,16 +17103,13 @@ echo "${ECHO_T}$gl_cv_next_time_h" >&6; } + HAVE_STRCASECMP=1; + HAVE_DECL_STRNCASECMP=1; -{ echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 -echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; } -if test "${ac_cv_func_utime_null+set}" = set; then +{ echo "$as_me:$LINENO: checking whether strdup is declared" >&5 +echo $ECHO_N "checking whether strdup is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_strdup+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f conftest.data; >conftest.data -# Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. -if test "$cross_compiling" = yes; then - ac_cv_func_utime_null=no else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16793,69 +17118,60 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default - #ifdef HAVE_UTIME_H - # include - #endif int main () { -struct stat s, t; - return ! (stat ("conftest.data", &s) == 0 - && utime ("conftest.data", 0) == 0 - && stat ("conftest.data", &t) == 0 - && t.st_mtime >= s.st_mtime - && t.st_mtime - s.st_mtime < 120); +#ifndef strdup + (void) strdup; +#endif + ; 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 - 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 + (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_utime_null=yes + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_strdup=yes 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 -( exit $ac_status ) -ac_cv_func_utime_null=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + ac_cv_have_decl_strdup=no fi - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 -echo "${ECHO_T}$ac_cv_func_utime_null" >&6; } -if test $ac_cv_func_utime_null = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strdup" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strdup" >&6; } +if test $ac_cv_have_decl_strdup = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_UTIME_NULL 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRDUP 1 _ACEOF -fi -rm -f conftest.data +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRDUP 0 +_ACEOF +fi @@ -16863,29 +17179,25 @@ rm -f conftest.data - { echo "$as_me:$LINENO: checking for struct utimbuf" >&5 -echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6; } -if test "${gl_cv_sys_struct_utimbuf+set}" = set; then + 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 - cat >conftest.$ac_ext <<_ACEOF + 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. */ -#if HAVE_SYS_TIME_H - #include - #endif - #include - #ifdef HAVE_UTIME_H - #include - #endif +#include int main () { -static struct utimbuf x; x.actime = x.modtime; +return !*strerror (-2); ; return 0; } @@ -16907,36 +17219,16 @@ 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_sys_struct_utimbuf=yes + gl_cv_func_working_strerror=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gl_cv_sys_struct_utimbuf=no + gl_cv_func_working_strerror=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $gl_cv_sys_struct_utimbuf" >&5 -echo "${ECHO_T}$gl_cv_sys_struct_utimbuf" >&6; } - - if test $gl_cv_sys_struct_utimbuf = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_STRUCT_UTIMBUF 1 -_ACEOF - - fi - - - { echo "$as_me:$LINENO: checking determine whether the utimes function works" >&5 -echo $ECHO_N "checking determine whether the utimes function works... $ECHO_C" >&6; } -if test "${gl_cv_func_working_utimes+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - gl_cv_func_working_utimes=no else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16944,57 +17236,15 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include int main () { - static struct timeval timeval[2] = {{9, 10}, {999999, 999999}}; - struct stat sbuf; - char const *file = "conftest.utimes"; - FILE *f; - time_t now; - int fd; - - int ok = ((f = fopen (file, "w")) - && fclose (f) == 0 - && utimes (file, timeval) == 0 - && lstat (file, &sbuf) == 0 - && sbuf.st_atime == timeval[0].tv_sec - && sbuf.st_mtime == timeval[1].tv_sec); - unlink (file); - if (!ok) - exit (1); - - ok = - ((f = fopen (file, "w")) - && fclose (f) == 0 - && time (&now) != (time_t)-1 - && utimes (file, NULL) == 0 - && lstat (file, &sbuf) == 0 - && now - sbuf.st_atime <= 2 - && now - sbuf.st_mtime <= 2); - unlink (file); - if (!ok) - exit (1); - - ok = (0 <= (fd = open (file, O_WRONLY|O_CREAT, 0444)) - && close (fd) == 0 - && utimes (file, NULL) == 0); - unlink (file); - - exit (!ok); +return !*strerror (-2); + ; + return 0; } - _ACEOF rm -f conftest$ac_exeext if { (ac_try="$ac_link" @@ -17016,45 +17266,34 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - gl_cv_func_working_utimes=yes + gl_cv_func_working_strerror=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_working_utimes=no +gl_cv_func_working_strerror=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_working_utimes" >&5 -echo "${ECHO_T}$gl_cv_func_working_utimes" >&6; } - - if test $gl_cv_func_working_utimes = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_UTIMES 1 -_ACEOF +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 + fi + else + REPLACE_STRERROR=1 fi + if test $REPLACE_STRERROR = 1; then - - - - - - - - - - - - { 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 + { echo "$as_me:$LINENO: checking whether strerror is declared" >&5 +echo $ECHO_N "checking whether strerror is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_strerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -17063,11 +17302,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - wchar_t foo = (wchar_t)'\0'; +$ac_includes_default int main () { +#ifndef strerror + (void) strerror; +#endif ; return 0; @@ -17090,55 +17331,66 @@ 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 - gt_cv_c_wchar_t=yes + ac_cv_have_decl_strerror=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gt_cv_c_wchar_t=no + ac_cv_have_decl_strerror=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5 -echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; } - if test $gt_cv_c_wchar_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strerror" >&6; } +if test $ac_cv_have_decl_strerror = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_WCHAR_T 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR 1 _ACEOF - fi +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRERROR 0 +_ACEOF - { echo "$as_me:$LINENO: checking for wint_t" >&5 -echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; } -if test "${gt_cv_c_wint_t+set}" = set; then + +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 - cat >conftest.$ac_ext <<_ACEOF + # 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. */ - -/* Tru64 with Desktop Toolkit C has a bug: must be included before - . - BSD/OS 4.0.1 has a bug: , and must be included - before . */ -#include -#include -#include -#include - wint_t foo = (wchar_t)'\0'; -int -main () -{ - - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -17157,172 +17409,246 @@ 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 - gt_cv_c_wint_t=yes + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gt_cv_c_wint_t=no + ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5 -echo "${ECHO_T}$gt_cv_c_wint_t" >&6; } - if test $gt_cv_c_wint_t = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WINT_T 1 -_ACEOF - - fi - +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } - { echo "$as_me:$LINENO: checking for inttypes.h" >&5 -echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; } -if test "${gl_cv_header_inttypes_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF +# 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 -#include -int -main () -{ -uintmax_t i = (uintmax_t) -1; return !i; - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (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); } && { - test -z "$ac_c_werror_flag" || + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - gl_cv_header_inttypes_h=yes + }; then + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gl_cv_header_inttypes_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_header_preproc=no fi -{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5 -echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; } - if test $gl_cv_header_inttypes_h = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_INTTYPES_H_WITH_UINTMAX 1 -_ACEOF +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 - { echo "$as_me:$LINENO: checking for stdint.h" >&5 -echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; } -if test "${gl_cv_header_stdint_h+set}" = set; then + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_string_h='<'string.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_string_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + if test $ac_cv_header_string_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 -#include -int -main () -{ -uintmax_t i = (uintmax_t) -1; return !i; - ; - return 0; -} +#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_header_stdint_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/string.h#{ + s#.*"\(.*/string.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_string_h='<'string.h'>' + fi - gl_cv_header_stdint_h=no fi +{ echo "$as_me:$LINENO: result: $gl_cv_next_string_h" >&5 +echo "${ECHO_T}$gl_cv_next_string_h" >&6; } + fi + NEXT_STRING_H=$gl_cv_next_string_h -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5 -echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; } - if test $gl_cv_header_stdint_h = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H_WITH_UINTMAX 1 -_ACEOF - fi - { echo "$as_me:$LINENO: checking for intmax_t" >&5 -echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; } -if test "${gt_cv_c_intmax_t+set}" = set; then + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_strings_h='<'strings.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_strings_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + if test $ac_cv_header_strings_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 + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_strings_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/strings.h#{ + s#.*"\(.*/strings.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_strings_h='<'strings.h'>' + fi + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_next_strings_h" >&5 +echo "${ECHO_T}$gl_cv_next_strings_h" >&6; } + fi + NEXT_STRINGS_H=$gl_cv_next_strings_h + -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -#include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include -#endif + +{ echo "$as_me:$LINENO: checking whether strndup is declared" >&5 +echo $ECHO_N "checking whether strndup is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_strndup+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 () { -intmax_t x = -1; return !x; +#ifndef strndup + (void) strndup; +#endif + ; return 0; } @@ -17344,39 +17670,37 @@ 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 - gt_cv_c_intmax_t=yes + ac_cv_have_decl_strndup=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gt_cv_c_intmax_t=no + ac_cv_have_decl_strndup=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5 -echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; } - if test $gt_cv_c_intmax_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strndup" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strndup" >&6; } +if test $ac_cv_have_decl_strndup = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_INTMAX_T 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNDUP 1 _ACEOF - else - - test $ac_cv_type_long_long_int = yes \ - && ac_type='long long' \ - || ac_type='long' -cat >>confdefs.h <<_ACEOF -#define intmax_t $ac_type +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNDUP 0 _ACEOF - fi -{ echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5 -echo $ECHO_N "checking whether vsnprintf is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_vsnprintf+set}" = set; then +fi + + +{ echo "$as_me:$LINENO: checking whether strnlen is declared" >&5 +echo $ECHO_N "checking whether strnlen is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_strnlen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -17389,8 +17713,8 @@ $ac_includes_default int main () { -#ifndef vsnprintf - (void) vsnprintf; +#ifndef strnlen + (void) strnlen; #endif ; @@ -17414,28 +17738,28 @@ 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_vsnprintf=yes + ac_cv_have_decl_strnlen=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl_vsnprintf=no + ac_cv_have_decl_strnlen=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5 -echo "${ECHO_T}$ac_cv_have_decl_vsnprintf" >&6; } -if test $ac_cv_have_decl_vsnprintf = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_strnlen" >&5 +echo "${ECHO_T}$ac_cv_have_decl_strnlen" >&6; } +if test $ac_cv_have_decl_strnlen = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_VSNPRINTF 1 +#define HAVE_DECL_STRNLEN 1 _ACEOF else cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_VSNPRINTF 0 +#define HAVE_DECL_STRNLEN 0 _ACEOF @@ -17443,41 +17767,44 @@ fi - GNULIB_WCWIDTH=0; - HAVE_DECL_WCWIDTH=1; - REPLACE_WCWIDTH=0; - WCHAR_H=''; + REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; + REPLACE_NANOSLEEP=GNULIB_PORTCHECK; + REPLACE_STRPTIME=GNULIB_PORTCHECK; + REPLACE_TIMEGM=GNULIB_PORTCHECK; -for ac_header in stdint.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 "$as_me:$LINENO: checking for struct timespec in " >&5 +echo $ECHO_N "checking for struct timespec in ... $ECHO_C" >&6; } +if test "${gl_cv_sys_struct_timespec_in_time_h+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 + 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> +#include + +int +main () +{ +static struct timespec x; x.tv_sec = x.tv_nsec; + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -17496,346 +17823,261 @@ 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_header_compiler=yes + gl_cv_sys_struct_timespec_in_time_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + gl_cv_sys_struct_timespec_in_time_h=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; } +fi +{ echo "$as_me:$LINENO: result: $gl_cv_sys_struct_timespec_in_time_h" >&5 +echo "${ECHO_T}$gl_cv_sys_struct_timespec_in_time_h" >&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 + TIME_H_DEFINES_STRUCT_TIMESPEC=0 + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=0 + if test $gl_cv_sys_struct_timespec_in_time_h = yes; then + TIME_H_DEFINES_STRUCT_TIMESPEC=1 + else + { echo "$as_me:$LINENO: checking for struct timespec in " >&5 +echo $ECHO_N "checking for struct timespec in ... $ECHO_C" >&6; } +if test "${gl_cv_sys_struct_timespec_in_sys_time_h+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 <$ac_header> +#include + +int +main () +{ +static struct timespec x; x.tv_sec = x.tv_nsec; + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.er1 + (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); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + gl_cv_sys_struct_timespec_in_sys_time_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + gl_cv_sys_struct_timespec_in_sys_time_h=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" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +{ echo "$as_me:$LINENO: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5 +echo "${ECHO_T}$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; } + if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then + SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1 + fi + fi -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 - { echo "$as_me:$LINENO: checking for SIZE_MAX" >&5 -echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; } - if test "${gl_cv_size_max+set}" = set; then + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_time_h='<'time.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_time_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - gl_cv_size_max= - cat >conftest.$ac_ext <<_ACEOF + if test $ac_cv_header_time_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 -#if HAVE_STDINT_H -#include -#endif -#ifdef SIZE_MAX -Found it -#endif +#include _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "Found it" >/dev/null 2>&1; then - gl_cv_size_max=yes + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/time.h#{ + s#.*"\(.*/time.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + else + gl_cv_next_time_h='<'time.h'>' + fi + fi -rm -f conftest* +{ echo "$as_me:$LINENO: result: $gl_cv_next_time_h" >&5 +echo "${ECHO_T}$gl_cv_next_time_h" >&6; } + fi + NEXT_TIME_H=$gl_cv_next_time_h - if test -z "$gl_cv_size_max"; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF + + + + + + + + + + + + + + + + +{ echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 +echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; } +if test "${ac_cv_func_utime_null+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + rm -f conftest.data; >conftest.data +# Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. +if test "$cross_compiling" = yes; then + ac_cv_func_utime_null=no +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 +$ac_includes_default + #ifdef HAVE_UTIME_H + # include + #endif int main () { -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= 0)]; -test_array [0] = 0 - +struct stat s, t; + return ! (stat ("conftest.data", &s) == 0 + && utime ("conftest.data", 0) == 0 + && stat ("conftest.data", &t) == 0 + && t.st_mtime >= s.st_mtime + && t.st_mtime - s.st_mtime < 120); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>&5 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. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in + (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_compile") 2>conftest.er1 + (eval "$ac_try") 2>&5 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 + (exit $ac_status); }; }; then + ac_cv_func_utime_null=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +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` +( exit $ac_status ) +ac_cv_func_utime_null=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) < 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. */ -#include -#include -int -main () -{ -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= $ac_mid)]; -test_array [0] = 0 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 +echo "${ECHO_T}$ac_cv_func_utime_null" >&6; } +if test $ac_cv_func_utime_null = yes; then - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define HAVE_UTIME_NULL 1 _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 conftest.data -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` + + + + + + + { echo "$as_me:$LINENO: checking for struct utimbuf" >&5 +echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6; } +if test "${gl_cv_sys_struct_utimbuf+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 +#if HAVE_SYS_TIME_H + #include + #endif + #include + #ifdef HAVE_UTIME_H + #include + #endif + int main () { -static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid)]; -test_array [0] = 0 - +static struct utimbuf x; x.actime = x.modtime; ; return 0; } @@ -17857,20 +18099,36 @@ 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_hi=$ac_mid + gl_cv_sys_struct_utimbuf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` + gl_cv_sys_struct_utimbuf=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) size_t_bits_minus_1=$ac_lo;; -'') size_t_bits_minus_1= ;; -esac +fi +{ echo "$as_me:$LINENO: result: $gl_cv_sys_struct_utimbuf" >&5 +echo "${ECHO_T}$gl_cv_sys_struct_utimbuf" >&6; } + + if test $gl_cv_sys_struct_utimbuf = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_STRUCT_UTIMBUF 1 +_ACEOF + + fi + + + { echo "$as_me:$LINENO: checking determine whether the utimes function works" >&5 +echo $ECHO_N "checking determine whether the utimes function works... $ECHO_C" >&6; } +if test "${gl_cv_func_working_utimes+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + gl_cv_func_working_utimes=no else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -17878,38 +18136,57 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -static long int longval () { return sizeof (size_t) * CHAR_BIT - 1; } -static unsigned long int ulongval () { return sizeof (size_t) * CHAR_BIT - 1; } -#include + +#include +#include +#include +#include +#include +#include #include +#include +#include + int main () { + static struct timeval timeval[2] = {{9, 10}, {999999, 999999}}; + struct stat sbuf; + char const *file = "conftest.utimes"; + FILE *f; + time_t now; + int fd; - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if ((sizeof (size_t) * CHAR_BIT - 1) < 0) - { - long int i = longval (); - if (i != (sizeof (size_t) * CHAR_BIT - 1)) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != (sizeof (size_t) * CHAR_BIT - 1)) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; + int ok = ((f = fopen (file, "w")) + && fclose (f) == 0 + && utimes (file, timeval) == 0 + && lstat (file, &sbuf) == 0 + && sbuf.st_atime == timeval[0].tv_sec + && sbuf.st_mtime == timeval[1].tv_sec); + unlink (file); + if (!ok) + exit (1); - ; - return 0; + ok = + ((f = fopen (file, "w")) + && fclose (f) == 0 + && time (&now) != (time_t)-1 + && utimes (file, NULL) == 0 + && lstat (file, &sbuf) == 0 + && now - sbuf.st_atime <= 2 + && now - sbuf.st_mtime <= 2); + unlink (file); + if (!ok) + exit (1); + + ok = (0 <= (fd = open (file, O_WRONLY|O_CREAT, 0444)) + && close (fd) == 0 + && utimes (file, NULL) == 0); + unlink (file); + + exit (!ok); } + _ACEOF rm -f conftest$ac_exeext if { (ac_try="$ac_link" @@ -17931,32 +18208,58 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - size_t_bits_minus_1=`cat conftest.val` + gl_cv_func_working_utimes=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 ) -size_t_bits_minus_1= +gl_cv_func_working_utimes=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.val - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF + + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_working_utimes" >&5 +echo "${ECHO_T}$gl_cv_func_working_utimes" >&6; } + + if test $gl_cv_func_working_utimes = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WORKING_UTIMES 1 +_ACEOF + + fi + + + + + + + + + + + + + { 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 + 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 + wchar_t foo = (wchar_t)'\0'; int main () { -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)]; -test_array [0] = 0 ; return 0; @@ -17979,20 +18282,51 @@ 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_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF + gt_cv_c_wchar_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gt_cv_c_wchar_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5 +echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; } + if test $gt_cv_c_wchar_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_WCHAR_T 1 +_ACEOF + + fi + + + { echo "$as_me:$LINENO: checking for wint_t" >&5 +echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; } +if test "${gt_cv_c_wint_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. */ + +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be included + before . */ #include +#include +#include +#include + wint_t foo = (wchar_t)'\0'; int main () { -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)]; -test_array [0] = 0 ; return 0; @@ -18015,38 +18349,44 @@ 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_hi=$ac_mid; break + gt_cv_c_wint_t=yes 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` + gt_cv_c_wint_t=no 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 +{ echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5 +echo "${ECHO_T}$gt_cv_c_wint_t" >&6; } + if test $gt_cv_c_wint_t = yes; then - cat >conftest.$ac_ext <<_ACEOF +cat >>confdefs.h <<\_ACEOF +#define HAVE_WINT_T 1 +_ACEOF + + fi + + + { echo "$as_me:$LINENO: checking for inttypes.h" >&5 +echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; } +if test "${gl_cv_header_inttypes_h+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 +#include int main () { -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)]; -test_array [0] = 0 - +uintmax_t i = (uintmax_t) -1; return !i; ; return 0; } @@ -18068,21 +18408,44 @@ 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_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF + gl_cv_header_inttypes_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + gl_cv_header_inttypes_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5 +echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; } + if test $gl_cv_header_inttypes_h = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_INTTYPES_H_WITH_UINTMAX 1 +_ACEOF + + fi + + + { echo "$as_me:$LINENO: checking for stdint.h" >&5 +echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; } +if test "${gl_cv_header_stdint_h+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 +#include int main () { -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)]; -test_array [0] = 0 - +uintmax_t i = (uintmax_t) -1; return !i; ; return 0; } @@ -18104,48 +18467,54 @@ 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_lo=$ac_mid; break + gl_cv_header_stdint_h=yes 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` + gl_cv_header_stdint_h=no 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 +{ echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5 +echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; } + if test $gl_cv_header_stdint_h = yes; then -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi +cat >>confdefs.h <<_ACEOF +#define HAVE_STDINT_H_WITH_UINTMAX 1 +_ACEOF -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` + fi + + + + + { echo "$as_me:$LINENO: checking for intmax_t" >&5 +echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; } +if test "${gt_cv_c_intmax_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 +#if HAVE_STDINT_H_WITH_UINTMAX +#include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include +#endif + int main () { -static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)]; -test_array [0] = 0 - +intmax_t x = -1; return !x; ; return 0; } @@ -18167,106 +18536,54 @@ 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_hi=$ac_mid + gt_cv_c_intmax_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` + gt_cv_c_intmax_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) fits_in_uint=$ac_lo;; -'') fits_in_uint= ;; -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 -static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); } -static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); } -#include -#include -int -main () -{ +fi +{ echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5 +echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; } + if test $gt_cv_c_intmax_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_INTMAX_T 1 +_ACEOF - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if ((sizeof (size_t) <= sizeof (unsigned int)) < 0) - { - long int i = longval (); - if (i != (sizeof (size_t) <= sizeof (unsigned int))) - return 1; - fprintf (f, "%ld\n", i); - } else - { - unsigned long int i = ulongval (); - if (i != (sizeof (size_t) <= sizeof (unsigned int))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} + test $ac_cv_type_long_long_int = yes \ + && ac_type='long long' \ + || ac_type='long' + +cat >>confdefs.h <<_ACEOF +#define intmax_t $ac_type _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 - 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 + fi + +{ echo "$as_me:$LINENO: checking whether vsnprintf is declared" >&5 +echo $ECHO_N "checking whether vsnprintf is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_vsnprintf+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 - extern size_t foo; - extern unsigned long foo; - +$ac_includes_default int main () { +#ifndef vsnprintf + (void) vsnprintf; +#endif ; return 0; @@ -18289,37 +18606,39 @@ 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 - fits_in_uint=0 + ac_cv_have_decl_vsnprintf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - + ac_cv_have_decl_vsnprintf=no 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 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_vsnprintf" >&5 +echo "${ECHO_T}$ac_cv_have_decl_vsnprintf" >&6; } +if test $ac_cv_have_decl_vsnprintf = yes; then cat >>confdefs.h <<_ACEOF -#define SIZE_MAX $gl_cv_size_max +#define HAVE_DECL_VSNPRINTF 1 _ACEOF - fi + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_VSNPRINTF 0 +_ACEOF + + +fi + + + + + + + if false; then @@ -18341,6 +18660,7 @@ fi + gl_source_base='.#bootmp/lib' @@ -18804,6 +19124,129 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + + if test $ac_cv_func_btowc = no; then + HAVE_BTOWC=0 + else + + + + { echo "$as_me:$LINENO: checking whether btowc(EOF) is correct" >&5 +echo $ECHO_N "checking whether btowc(EOF) is correct... $ECHO_C" >&6; } +if test "${gl_cv_func_btowc_eof+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + case "$host_os" in + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; + esac + if test $LOCALE_FR != none; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +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 +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + if (btowc (EOF) != WEOF) + return 1; + } + 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_func_btowc_eof=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_btowc_eof=no +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: $gl_cv_func_btowc_eof" >&5 +echo "${ECHO_T}$gl_cv_func_btowc_eof" >&6; } + case "$gl_cv_func_btowc_eof" in + *yes) ;; + *) REPLACE_BTOWC=1 ;; + esac + fi + if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + + + WCHAR_H=wchar.h + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS btowc.$ac_objext" + + + : + + fi + + + + GNULIB_BTOWC=1 + + + + + + + + + @@ -19355,6 +19798,7 @@ _ACEOF + if test $gl_cv_have_include_next = yes; then gl_cv_next_dirent_h='<'dirent.h'>' else @@ -19374,7 +19818,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_dirent_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_dirent_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/dirent.h#{ s#.*"\(.*/dirent.h\)".*#\1# s#^/[^/]#//&# @@ -19985,8 +20433,6 @@ _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 @@ -20168,6 +20614,8 @@ _ACEOF fi REPLACE_FCLOSE=1 + LIB_CLOSE="-lws2_32" + @@ -20319,6 +20767,7 @@ _ACEOF + if test $gl_cv_have_include_next = yes; then gl_cv_next_fcntl_h='<'fcntl.h'>' else @@ -20338,7 +20787,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_fcntl_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_fcntl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/fcntl.h#{ s#.*"\(.*/fcntl.h\)".*#\1# s#^/[^/]#//&# @@ -20537,6 +20990,7 @@ fi + if test $gl_cv_have_include_next = yes; then gl_cv_next_float_h='<'float.h'>' else @@ -20556,7 +21010,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_float_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_float_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/float.h#{ s#.*"\(.*/float.h\)".*#\1# s#^/[^/]#//&# @@ -24293,6 +24751,7 @@ echo "${ECHO_T}$gl_cv_header_working_inttypes_h" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_inttypes_h='<'inttypes.h'>' else @@ -24312,7 +24771,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_inttypes_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/inttypes.h#{ s#.*"\(.*/inttypes.h\)".*#\1# s#^/[^/]#//&# @@ -24333,6 +24796,8 @@ echo "${ECHO_T}$gl_cv_next_inttypes_h" >&6; } + + cat >>confdefs.h <<\_ACEOF #define GL_TRIGGER_STDC_LIMIT_MACROS 1 _ACEOF @@ -24498,6 +24963,7 @@ echo "${ECHO_T}$gl_cv_test_INT32_MAX_LT_INTMAX_MAX" >&6; } fi + if test $APPLE_UNIVERSAL_BUILD = 0; then { echo "$as_me:$LINENO: checking whether INT64_MAX == LONG_MAX" >&5 echo $ECHO_N "checking whether INT64_MAX == LONG_MAX... $ECHO_C" >&6; } @@ -24573,6 +25039,9 @@ echo "${ECHO_T}$gl_cv_test_INT64_MAX_EQ_LONG_MAX" >&6; } fi + else + INT64_MAX_EQ_LONG_MAX=-1 + fi { echo "$as_me:$LINENO: checking whether UINT32_MAX < UINTMAX_MAX" >&5 echo $ECHO_N "checking whether UINT32_MAX < UINTMAX_MAX... $ECHO_C" >&6; } @@ -24648,6 +25117,7 @@ echo "${ECHO_T}$gl_cv_test_UINT32_MAX_LT_UINTMAX_MAX" >&6; } fi + if test $APPLE_UNIVERSAL_BUILD = 0; then { echo "$as_me:$LINENO: checking whether UINT64_MAX == ULONG_MAX" >&5 echo $ECHO_N "checking whether UINT64_MAX == ULONG_MAX... $ECHO_C" >&6; } @@ -24723,6 +25193,9 @@ echo "${ECHO_T}$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; } fi + else + UINT64_MAX_EQ_ULONG_MAX=-1 + fi INTTYPES_H='inttypes.h' fi @@ -24978,7 +25451,14 @@ _ACEOF - { echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 + + + + + + + if test $ac_cv_func_lstat = yes; then + { 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 echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -25072,12 +25552,12 @@ if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then fi - if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - REPLACE_LSTAT=1 - fi - # Prerequisites of lib/lstat.c. + if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then + REPLACE_LSTAT=1 + fi + # Prerequisites of lib/lstat.c. - : + fi @@ -25365,17 +25845,14 @@ _ACEOF - : - GNULIB_MBSCASECMP=1 - : @@ -25385,371 +25862,453 @@ _ACEOF + if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then -for ac_func in memchr -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 "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5 +echo $ECHO_N "checking whether mbrtowc handles incomplete characters... $ECHO_C" >&6; } +if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + case "$host_os" in + # Guess no on AIX and OSF/1. + osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; + esac + if test $LOCALE_JA != none; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +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 () +#include +#include +#include +int main () { -return $ac_func (); - ; + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 1; + } return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +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>conftest.er1 + (eval "$ac_link") 2>&5 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" + (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_mbrtowc_incomplete_state=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" +( exit $ac_status ) +gl_cv_func_mbrtowc_incomplete_state=no fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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 fi -done +{ echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_incomplete_state" >&5 +echo "${ECHO_T}$gl_cv_func_mbrtowc_incomplete_state" >&6; } + case "$gl_cv_func_mbrtowc_incomplete_state" in + *yes) REPLACE_MBSTATE_T=0 ;; + *) REPLACE_MBSTATE_T=1 ;; + esac + else + REPLACE_MBSTATE_T=1 + fi + if test $REPLACE_MBSTATE_T = 1; then - if test $ac_cv_func_memchr = no; then + WCHAR_H=wchar.h -for ac_header in bp-sym.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 + fi + + if test $REPLACE_MBSTATE_T = 1; then + REPLACE_MBRTOWC=1 + fi + + + + + + + if test $ac_cv_func_mbrtowc = no; then + HAVE_MBRTOWC=0 + fi + if test $HAVE_MBRTOWC != 0 && test $REPLACE_MBRTOWC != 1; then + + + + { echo "$as_me:$LINENO: checking whether mbrtowc handles a NULL string argument" >&5 +echo $ECHO_N "checking whether mbrtowc handles a NULL string argument... $ECHO_C" >&6; } +if test "${gl_cv_func_mbrtowc_null_arg+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 + + case "$host_os" in + # Guess no on OSF/1. + osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_null_arg="guessing yes" ;; + esac + if test $LOCALE_FR_UTF8 != none; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +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 <$ac_header> + +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + mbstate_t state; + wchar_t wc; + int ret; + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (wchar_t) 0xBADFACE; + mbrtowc (&wc, NULL, 5, &state); + /* Check that wc was not modified. */ + if (wc != (wchar_t) 0xBADFACE) + return 1; + } + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>&5 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 + (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_mbrtowc_null_arg=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no +( exit $ac_status ) +gl_cv_func_mbrtowc_null_arg=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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 + fi + +fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_null_arg" >&5 +echo "${ECHO_T}$gl_cv_func_mbrtowc_null_arg" >&6; } + + + + + + { echo "$as_me:$LINENO: checking whether mbrtowc has a correct return value" >&5 +echo $ECHO_N "checking whether mbrtowc has a correct return value... $ECHO_C" >&6; } +if test "${gl_cv_func_mbrtowc_retval+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + case "$host_os" in + # Guess no on HP-UX and Solaris. + hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_retval="guessing yes" ;; + esac + if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + 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> + +#include +#include +#include +int main () +{ + /* This fails on Solaris. */ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + char input[] = "B\303\274\303\237er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + { + input[1] = '\0'; + if (mbrtowc (&wc, input + 2, 5, &state) != 1) + return 1; + } + } + /* This fails on HP-UX 11.11. */ + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + { + input[1] = '\0'; + if (mbrtowc (&wc, input + 2, 5, &state) != 2) + return 1; + } + } + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 2>&5 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 - ;; + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; 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 +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_mbrtowc_retval=yes 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; } + 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_mbrtowc_retval=no fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -done - - - fi - - - - - - - - - - + fi +fi +{ echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_retval" >&5 +echo "${ECHO_T}$gl_cv_func_mbrtowc_retval" >&6; } -for ac_func in mempcpy -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 "$as_me:$LINENO: checking whether mbrtowc returns 0 when parsing a NUL character" >&5 +echo $ECHO_N "checking whether mbrtowc returns 0 when parsing a NUL character... $ECHO_C" >&6; } +if test "${gl_cv_func_mbrtowc_nul_retval+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + case "$host_os" in + # Guess no on Solaris 9. + solaris2.9) gl_cv_func_mbrtowc_nul_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_nul_retval="guessing yes" ;; + esac + if test $LOCALE_ZH_CN != none; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +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 () +#include +#include +#include +int main () { -return $ac_func (); - ; + /* This fails on Solaris 9. */ + if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + { + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "", 1, &state) != 0) + return 1; + } return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +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>conftest.er1 + (eval "$ac_link") 2>&5 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" + (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_mbrtowc_nul_retval=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" +( exit $ac_status ) +gl_cv_func_mbrtowc_nul_retval=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + + fi + 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 +{ echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc_nul_retval" >&5 +echo "${ECHO_T}$gl_cv_func_mbrtowc_nul_retval" >&6; } + + case "$gl_cv_func_mbrtowc_null_arg" in + *yes) ;; + *) +cat >>confdefs.h <<\_ACEOF +#define MBRTOWC_NULL_ARG_BUG 1 _ACEOF -else + REPLACE_MBRTOWC=1 + ;; + esac + case "$gl_cv_func_mbrtowc_retval" in + *yes) ;; + *) +cat >>confdefs.h <<\_ACEOF +#define MBRTOWC_RETVAL_BUG 1 +_ACEOF + + REPLACE_MBRTOWC=1 + ;; + esac + case "$gl_cv_func_mbrtowc_nul_retval" in + *yes) ;; + *) +cat >>confdefs.h <<\_ACEOF +#define MBRTOWC_NUL_RETVAL_BUG 1 +_ACEOF + + REPLACE_MBRTOWC=1 + ;; + esac + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + + + WCHAR_H=wchar.h - gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext" -fi -done - if test $ac_cv_func_mempcpy = no; then - HAVE_MEMPCPY=0 + + + + + + gl_LIBOBJS="$gl_LIBOBJS mbrtowc.$ac_objext" + : @@ -25757,19 +26316,19 @@ done - GNULIB_MEMPCPY=1 + GNULIB_MBRTOWC=1 + + : + GNULIB_MBSCASECMP=1 - if test $ac_cv_have_decl_memrchr = no; then - HAVE_DECL_MEMRCHR=0 - fi @@ -25780,50 +26339,218 @@ done -for ac_func in memrchr -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 $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then + + + + { echo "$as_me:$LINENO: checking whether mbrtowc handles incomplete characters" >&5 +echo $ECHO_N "checking whether mbrtowc handles incomplete characters... $ECHO_C" >&6; } +if test "${gl_cv_func_mbrtowc_incomplete_state+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + + case "$host_os" in + # Guess no on AIX and OSF/1. + osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; + esac + if test $LOCALE_JA != none; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +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 +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 1; + } + 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_func_mbrtowc_incomplete_state=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_mbrtowc_incomplete_state=no +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: $gl_cv_func_mbrtowc_incomplete_state" >&5 +echo "${ECHO_T}$gl_cv_func_mbrtowc_incomplete_state" >&6; } + + case "$gl_cv_func_mbrtowc_incomplete_state" in + *yes) REPLACE_MBSTATE_T=0 ;; + *) REPLACE_MBSTATE_T=1 ;; + esac + else + REPLACE_MBSTATE_T=1 + fi + if test $REPLACE_MBSTATE_T = 1; then + + + WCHAR_H=wchar.h + + fi + + if test $REPLACE_MBSTATE_T = 1; then + REPLACE_MBSINIT=1 + fi + + + + + + + if test $ac_cv_func_mbsinit = no; then + HAVE_MBSINIT=0 + fi + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + + + WCHAR_H=wchar.h -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $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 + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS mbsinit.$ac_objext" + + + : + + fi + + + + GNULIB_MBSINIT=1 + + + + + : + + + + + + + + + + + + + + + + +for ac_func in mempcpy +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 () @@ -25878,13 +26605,16 @@ fi done - if test $ac_cv_func_memrchr = no; then - : + if test $ac_cv_func_mempcpy = no; then + HAVE_MEMPCPY=0 + + : + fi - GNULIB_MEMRCHR=1 + GNULIB_MEMPCPY=1 @@ -25894,9 +26624,20 @@ done + if test $ac_cv_have_decl_memrchr = no; then + HAVE_DECL_MEMRCHR=0 + fi + + + + + -for ac_func in memset + + + +for ac_func in memrchr do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -25994,11 +26735,13 @@ fi done - if test $ac_cv_func_memset = no; then + if test $ac_cv_func_memrchr = no; then + : + fi + - : - fi + GNULIB_MEMRCHR=1 @@ -26132,6 +26875,13 @@ done + +if test $APPLE_UNIVERSAL_BUILD = 1; then + # A universal build on Apple MacOS X platforms. + # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. + # But we need a configuration result that is valid in both modes. + ac_cv_func_working_mktime=no +fi { echo "$as_me:$LINENO: checking for working mktime" >&5 echo $ECHO_N "checking for working mktime... $ECHO_C" >&6; } if test "${ac_cv_func_working_mktime+set}" = set; then @@ -26197,16 +26947,14 @@ spring_forward_gap () } static int -mktime_test1 (now) - time_t now; +mktime_test1 (time_t now) { struct tm *lt; return ! (lt = localtime (&now)) || mktime (lt) == now; } static int -mktime_test (now) - time_t now; +mktime_test (time_t now) { return (mktime_test1 (now) && mktime_test1 ((time_t) (time_t_max - now)) @@ -26230,8 +26978,7 @@ irix_6_4_bug () } static int -bigtime_test (j) - int j; +bigtime_test (int j) { struct tm tm; time_t now; @@ -26415,6 +27162,7 @@ _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 @@ -27032,7 +27780,9 @@ _ACEOF - { echo "$as_me:$LINENO: checking for mbstate_t" >&5 + + + { 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 @@ -27096,9 +27846,10 @@ _ACEOF fi - { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5 + + { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5 echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; } -if test "${gl_cv_func_mbrtowc+set}" = set; then +if test "${ac_cv_func_mbrtowc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27112,10 +27863,10 @@ int main () { wchar_t wc; - char const s[] = ""; - size_t n = 1; - mbstate_t state; - return ! (sizeof state && (mbrtowc) (&wc, s, n, &state)); + char const s[] = ""; + size_t n = 1; + mbstate_t state; + return ! (sizeof state && (mbrtowc) (&wc, s, n, &state)); ; return 0; } @@ -27138,20 +27889,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - gl_cv_func_mbrtowc=yes + ac_cv_func_mbrtowc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - gl_cv_func_mbrtowc=no + ac_cv_func_mbrtowc=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_func_mbrtowc" >&5 -echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6; } - if test $gl_cv_func_mbrtowc = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_mbrtowc" >&5 +echo "${ECHO_T}$ac_cv_func_mbrtowc" >&6; } + if test $ac_cv_func_mbrtowc = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_MBRTOWC 1 @@ -27802,10 +28553,6 @@ done - - - - { echo "$as_me:$LINENO: checking whether isblank is declared" >&5 echo $ECHO_N "checking whether isblank is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_isblank+set}" = set; then @@ -27888,7 +28635,10 @@ fi -for ac_func in rmdir + + + +for ac_func in rpmatch do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -27986,21 +28736,315 @@ fi 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 -for ac_func in rpmatch + + + + + + gl_LIBOBJS="$gl_LIBOBJS safe-read.$ac_objext" + + + + + + + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS safe-write.$ac_objext" + + + + + + + + + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS save-cwd.$ac_objext" + + + + + + + + + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS savedir.$ac_objext" + + + + + + + + + + + if test $ac_cv_func_setenv = no; then + HAVE_SETENV=0 + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext" + + + + + + + + + + + +for ac_header in search.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 + + +for ac_func in tsearch do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -28090,178 +29134,19 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then #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_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 - - - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS safe-read.$ac_objext" - - - - - - - - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS safe-write.$ac_objext" - - - - - - - - - - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS save-cwd.$ac_objext" - - - - - - - - - - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS savedir.$ac_objext" - - - - - - - - - - - if test $ac_cv_func_setenv = no; then - HAVE_SETENV=0 - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS setenv.$ac_objext" - - - - - - - - + GNULIB_SETENV=1 -for ac_header in search.h +for ac_header in stdint.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 @@ -28405,68 +29290,378 @@ fi done - -for ac_func in tsearch -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 "$as_me:$LINENO: checking for SIZE_MAX" >&5 +echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; } + if test "${gl_cv_size_max+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + gl_cv_size_max= + 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 +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it #endif -#undef $ac_func +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "Found it" >/dev/null 2>&1; then + gl_cv_size_max=yes +fi +rm -f conftest* -/* 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 + if test -z "$gl_cv_size_max"; 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. */ +#include +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= 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. */ +#include +#include int main () { -return $ac_func (); +static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +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. */ +#include +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) < 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. */ +#include +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) >= $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. */ +#include +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) * CHAR_BIT - 1) <= $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 +?*) size_t_bits_minus_1=$ac_lo;; +'') size_t_bits_minus_1= ;; +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 +#include +static long int longval () { return sizeof (size_t) * CHAR_BIT - 1; } +static unsigned long int ulongval () { return sizeof (size_t) * CHAR_BIT - 1; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if ((sizeof (size_t) * CHAR_BIT - 1) < 0) + { + long int i = longval (); + if (i != (sizeof (size_t) * CHAR_BIT - 1)) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != (sizeof (size_t) * CHAR_BIT - 1)) + 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>conftest.er1 + (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 + size_t_bits_minus_1=`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 ) +size_t_bits_minus_1= +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 "$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. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 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 @@ -28475,36 +29670,348 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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" + } && 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. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $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 - eval "$as_ac_var=no" + 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_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +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. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 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. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $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 -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 + +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. */ +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $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 +?*) fits_in_uint=$ac_lo;; +'') fits_in_uint= ;; +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 +static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); } +static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); } +#include +#include +int +main () +{ + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if ((sizeof (size_t) <= sizeof (unsigned int)) < 0) + { + long int i = longval (); + if (i != (sizeof (size_t) <= sizeof (unsigned int))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != (sizeof (size_t) <= sizeof (unsigned int))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; - fi + ; + 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 + 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 - GNULIB_SETENV=1 + +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 @@ -28715,7 +30222,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include int main() { - static char buf[8] = "DEADBEEF"; + static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' }; snprintf (buf, 1, "%d", 12345); return buf[1] != 'E'; } @@ -29778,6 +31285,7 @@ rm -f conftest* + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdarg_h='<'stdarg.h'>' else @@ -29797,7 +31305,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_stdarg_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/stdarg.h#{ s#.*"\(.*/stdarg.h\)".*#\1# s#^/[^/]#//&# @@ -29950,6 +31462,7 @@ _ACEOF + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdint_h='<'stdint.h'>' else @@ -29969,7 +31482,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_stdint_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/stdint.h#{ s#.*"\(.*/stdint.h\)".*#\1# s#^/[^/]#//&# @@ -30186,197 +31703,602 @@ 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_header_working_stdint_h=yes + gl_cv_header_working_stdint_h=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 +fi +{ echo "$as_me:$LINENO: result: $gl_cv_header_working_stdint_h" >&5 +echo "${ECHO_T}$gl_cv_header_working_stdint_h" >&6; } + fi + if test "$gl_cv_header_working_stdint_h" = yes; then + STDINT_H= + else + + +for ac_header in sys/inttypes.h sys/bitypes.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 + + if test $ac_cv_header_sys_inttypes_h = yes; then + HAVE_SYS_INTTYPES_H=1 + else + HAVE_SYS_INTTYPES_H=0 + fi + + if test $ac_cv_header_sys_bitypes_h = yes; then + HAVE_SYS_BITYPES_H=1 + else + HAVE_SYS_BITYPES_H=0 + fi + + + + + + + + + + + + if test $APPLE_UNIVERSAL_BUILD = 0; then + + + + + for gltype in ptrdiff_t size_t ; do + { echo "$as_me:$LINENO: checking for bit size of $gltype" >&5 +echo $ECHO_N "checking for bit size of $gltype... $ECHO_C" >&6; } +if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + 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. */ + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= 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. */ + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $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. */ + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) < 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. */ + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) >= $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. */ + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +int +main () +{ +static int test_array [1 - 2 * !((sizeof ($gltype) * CHAR_BIT) <= $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 -fi -{ echo "$as_me:$LINENO: result: $gl_cv_header_working_stdint_h" >&5 -echo "${ECHO_T}$gl_cv_header_working_stdint_h" >&6; } - fi - if test "$gl_cv_header_working_stdint_h" = yes; then - STDINT_H= - else - - -for ac_header in sys/inttypes.h sys/bitypes.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; } +done +case $ac_lo in +?*) result=$ac_lo;; +'') result=unknown ;; +esac 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 + 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> + + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + +#include +static long int longval () { return sizeof ($gltype) * CHAR_BIT; } +static unsigned long int ulongval () { return sizeof ($gltype) * CHAR_BIT; } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if ((sizeof ($gltype) * CHAR_BIT) < 0) + { + long int i = longval (); + if (i != (sizeof ($gltype) * CHAR_BIT)) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != (sizeof ($gltype) * CHAR_BIT)) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>&5 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 + (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_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_try") 2>&5 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 + (exit $ac_status); }; }; then + result=`cat conftest.val` else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +( exit $ac_status ) +result=unknown 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 + eval gl_cv_bitsizeof_${gltype}=\$result -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'}'` +ac_res=`eval echo '${'gl_cv_bitsizeof_${gltype}'}'` { 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 - - if test $ac_cv_header_sys_inttypes_h = yes; then - HAVE_SYS_INTTYPES_H=1 - else - HAVE_SYS_INTTYPES_H=0 - fi - - if test $ac_cv_header_sys_bitypes_h = yes; then - HAVE_SYS_BITYPES_H=1 - else - HAVE_SYS_BITYPES_H=0 + eval result=\$gl_cv_bitsizeof_${gltype} + if test $result = unknown; then + result=0 fi + GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + cat >>confdefs.h <<_ACEOF +#define BITSIZEOF_${GLTYPE} $result +_ACEOF + eval BITSIZEOF_${GLTYPE}=\$result + done + fi - - - - - - - - - - for gltype in ptrdiff_t sig_atomic_t size_t wchar_t wint_t ; do + for gltype in sig_atomic_t wchar_t wint_t ; do { echo "$as_me:$LINENO: checking for bit size of $gltype" >&5 echo $ECHO_N "checking for bit size of $gltype... $ECHO_C" >&6; } if { as_var=gl_cv_bitsizeof_${gltype}; eval "test \"\${$as_var+set}\" = set"; }; then @@ -30861,14 +32783,113 @@ _ACEOF gl_cv_type_ptrdiff_t_signed=yes gl_cv_type_size_t_signed=no + if test $APPLE_UNIVERSAL_BUILD = 0; then + + + + + for gltype in ptrdiff_t size_t ; do + { echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5 +echo $ECHO_N "checking for $gltype integer literal suffix... $ECHO_C" >&6; } +if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval gl_cv_type_${gltype}_suffix=no + eval result=\$gl_cv_type_${gltype}_signed + if test "$result" = yes; then + glsufu= + else + glsufu=u + fi + for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do + case $glsuf in + '') gltype1='int';; + l) gltype1='long int';; + ll) gltype1='long long int';; + i64) gltype1='__int64';; + u) gltype1='unsigned int';; + ul) gltype1='unsigned long int';; + ull) gltype1='unsigned long long int';; + ui64)gltype1='unsigned __int64';; + esac + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + /* BSD/OS 4.0.1 has a bug: , and must be + included before . */ + #include + #include + #if HAVE_WCHAR_H + # include + # include + # include + #endif + extern $gltype foo; + extern $gltype1 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 + eval gl_cv_type_${gltype}_suffix=\$glsuf +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 + eval result=\$gl_cv_type_${gltype}_suffix + test "$result" != no && break + done +fi +ac_res=`eval echo '${'gl_cv_type_${gltype}_suffix'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` + eval result=\$gl_cv_type_${gltype}_suffix + test "$result" = no && result= + eval ${GLTYPE}_SUFFIX=\$result + cat >>confdefs.h <<_ACEOF +#define ${GLTYPE}_SUFFIX $result +_ACEOF + + done + + + fi - for gltype in ptrdiff_t sig_atomic_t size_t wchar_t wint_t ; do + + for gltype in sig_atomic_t wchar_t wint_t ; do { echo "$as_me:$LINENO: checking for $gltype integer literal suffix" >&5 echo $ECHO_N "checking for $gltype integer literal suffix... $ECHO_C" >&6; } if { as_var=gl_cv_type_${gltype}_suffix; eval "test \"\${$as_var+set}\" = set"; }; then @@ -30980,6 +33001,7 @@ _ACEOF + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdio_h='<'stdio.h'>' else @@ -30999,7 +33021,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_stdio_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/stdio.h#{ s#.*"\(.*/stdio.h\)".*#\1# s#^/[^/]#//&# @@ -31042,6 +33068,7 @@ echo "${ECHO_T}$gl_cv_next_stdio_h" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_stdlib_h='<'stdlib.h'>' else @@ -31061,7 +33088,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_stdlib_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/stdlib.h#{ s#.*"\(.*/stdlib.h\)".*#\1# s#^/[^/]#//&# @@ -31080,6 +33111,157 @@ echo "${ECHO_T}$gl_cv_next_stdlib_h" >&6; } + +for ac_header in random.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 + + if test $ac_cv_header_random_h = yes; then + HAVE_RANDOM_H=1 + else + HAVE_RANDOM_H=0 + fi + { 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 @@ -31092,6 +33274,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include + #if HAVE_RANDOM_H + # include + #endif + typedef struct random_data ac__type_new_; int @@ -31697,6 +33883,20 @@ done + if test $gl_cv_func_malloc_posix != yes; then + REPLACE_STRDUP=1 + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strdup.$ac_objext" + + else + @@ -31803,6 +34003,7 @@ fi done + fi @@ -32159,7 +34360,7 @@ test $ac_cv_func_strnlen_working = no && # This is necessary because automake-1.6.1 doesn't understand # that the above use of AC_FUNC_STRNLEN means we may have to use # lib/strnlen.c. - #AC_LIBOBJ(strnlen) + #AC_LIBOBJ([strnlen]) cat >>confdefs.h <<\_ACEOF #define strnlen rpl_strnlen @@ -33104,6 +35305,7 @@ fi + if test $gl_cv_have_include_next = yes; then gl_cv_next_sys_stat_h='<'sys/stat.h'>' else @@ -33123,7 +35325,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_sys_stat_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/sys/stat.h#{ s#.*"\(.*/sys/stat.h\)".*#\1# s#^/[^/]#//&# @@ -33318,6 +35524,7 @@ echo "${ECHO_T}$MKDIR_P" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_sysexits_h='<'sysexits.h'>' else @@ -33337,7 +35544,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_sysexits_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_sysexits_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/sysexits.h#{ s#.*"\(.*/sysexits.h\)".*#\1# s#^/[^/]#//&# @@ -33540,6 +35751,7 @@ echo "${ECHO_T}$gl_cv_time_r_posix" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_unistd_h='<'unistd.h'>' else @@ -33559,7 +35771,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_unistd_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/unistd.h#{ s#.*"\(.*/unistd.h\)".*#\1# s#^/[^/]#//&# @@ -34484,7 +36700,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include int main() { - static char buf[8] = "DEADBEEF"; + static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' }; snprintf (buf, 1, "%d", 12345); return buf[1] != 'E'; } @@ -34639,6 +36855,7 @@ echo "${ECHO_T}$gl_cv_header_wchar_h_standalone" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_wchar_h='<'wchar.h'>' else @@ -34658,7 +36875,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_wchar_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/wchar.h#{ s#.*"\(.*/wchar.h\)".*#\1# s#^/[^/]#//&# @@ -34686,6 +36907,148 @@ echo "${ECHO_T}$gl_cv_next_wchar_h" >&6; } + + + if test $ac_cv_func_wcrtomb = no; then + HAVE_WCRTOMB=0 + else + + + + + + + { echo "$as_me:$LINENO: checking whether wcrtomb return value is correct" >&5 +echo $ECHO_N "checking whether wcrtomb return value is correct... $ECHO_C" >&6; } +if test "${gl_cv_func_wcrtomb_retval+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + case "$host_os" in + # Guess no on OSF/1 and Solaris. + osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_wcrtomb_retval="guessing yes" ;; + esac + if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +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 +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + 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_func_wcrtomb_retval=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_wcrtomb_retval=no +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: $gl_cv_func_wcrtomb_retval" >&5 +echo "${ECHO_T}$gl_cv_func_wcrtomb_retval" >&6; } + case "$gl_cv_func_wcrtomb_retval" in + *yes) ;; + *) REPLACE_WCRTOMB=1 ;; + esac + fi + if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then + + + WCHAR_H=wchar.h + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS wcrtomb.$ac_objext" + + + : + + fi + + + + GNULIB_WCRTOMB=1 + + + + + + + + + if test $ac_cv_func_iswcntrl = yes; then HAVE_ISWCNTRL=1 else @@ -34828,6 +37191,7 @@ echo "${ECHO_T}$gl_cv_func_iswcntrl_works" >&6; } + if test $gl_cv_have_include_next = yes; then gl_cv_next_wctype_h='<'wctype.h'>' else @@ -34847,7 +37211,11 @@ cat >>conftest.$ac_ext <<_ACEOF #include _ACEOF - gl_cv_next_wctype_h='"'`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | sed -n '\#/wctype.h#{ s#.*"\(.*/wctype.h\)".*#\1# s#^/[^/]#//&# @@ -35343,6 +37711,7 @@ done + gl_source_base='.#bootmp/tests' @@ -37502,12 +39871,16 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBICONV_PREFIX="$basedir" + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; */$acl_libdirstem2 | */$acl_libdirstem2/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - LIBICONV_PREFIX="$basedir" + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -39367,12 +41740,16 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBINTL_PREFIX="$basedir" + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; */$acl_libdirstem2 | */$acl_libdirstem2/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` - LIBINTL_PREFIX="$basedir" + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -40273,7 +42650,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.21, which was +This file was extended by GNU tar $as_me 1.22, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -40326,7 +42703,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU tar config.status 1.21 +GNU tar config.status 1.22 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -40600,6 +42977,14 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim RANLIB!$RANLIB$ac_delim YACC!$YACC$ac_delim YFLAGS!$YFLAGS$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim CPP!$CPP$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim @@ -40610,15 +42995,7 @@ GL_COND_LIBTOOL_FALSE!$GL_COND_LIBTOOL_FALSE$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_BTOWC!$GNULIB_BTOWC$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -40660,6 +43037,49 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +GNULIB_WCTOB!$GNULIB_WCTOB$ac_delim +GNULIB_MBSINIT!$GNULIB_MBSINIT$ac_delim +GNULIB_MBRTOWC!$GNULIB_MBRTOWC$ac_delim +GNULIB_MBRLEN!$GNULIB_MBRLEN$ac_delim +GNULIB_MBSRTOWCS!$GNULIB_MBSRTOWCS$ac_delim +GNULIB_MBSNRTOWCS!$GNULIB_MBSNRTOWCS$ac_delim +GNULIB_WCRTOMB!$GNULIB_WCRTOMB$ac_delim +GNULIB_WCSRTOMBS!$GNULIB_WCSRTOMBS$ac_delim +GNULIB_WCSNRTOMBS!$GNULIB_WCSNRTOMBS$ac_delim +GNULIB_WCWIDTH!$GNULIB_WCWIDTH$ac_delim +HAVE_BTOWC!$HAVE_BTOWC$ac_delim +HAVE_MBSINIT!$HAVE_MBSINIT$ac_delim +HAVE_MBRTOWC!$HAVE_MBRTOWC$ac_delim +HAVE_MBRLEN!$HAVE_MBRLEN$ac_delim +HAVE_MBSRTOWCS!$HAVE_MBSRTOWCS$ac_delim +HAVE_MBSNRTOWCS!$HAVE_MBSNRTOWCS$ac_delim +HAVE_WCRTOMB!$HAVE_WCRTOMB$ac_delim +HAVE_WCSRTOMBS!$HAVE_WCSRTOMBS$ac_delim +HAVE_WCSNRTOMBS!$HAVE_WCSNRTOMBS$ac_delim +HAVE_DECL_WCTOB!$HAVE_DECL_WCTOB$ac_delim +HAVE_DECL_WCWIDTH!$HAVE_DECL_WCWIDTH$ac_delim +REPLACE_MBSTATE_T!$REPLACE_MBSTATE_T$ac_delim +REPLACE_BTOWC!$REPLACE_BTOWC$ac_delim +REPLACE_WCTOB!$REPLACE_WCTOB$ac_delim +REPLACE_MBSINIT!$REPLACE_MBSINIT$ac_delim +REPLACE_MBRTOWC!$REPLACE_MBRTOWC$ac_delim +REPLACE_MBRLEN!$REPLACE_MBRLEN$ac_delim +REPLACE_MBSRTOWCS!$REPLACE_MBSRTOWCS$ac_delim +REPLACE_MBSNRTOWCS!$REPLACE_MBSNRTOWCS$ac_delim +REPLACE_WCRTOMB!$REPLACE_WCRTOMB$ac_delim +REPLACE_WCSRTOMBS!$REPLACE_WCSRTOMBS$ac_delim +REPLACE_WCWIDTH!$REPLACE_WCWIDTH$ac_delim +WCHAR_H!$WCHAR_H$ac_delim +LOCALE_FR!$LOCALE_FR$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_GETDOMAINNAME!$GNULIB_GETDOMAINNAME$ac_delim GNULIB_GETDTABLESIZE!$GNULIB_GETDTABLESIZE$ac_delim GNULIB_GETHOSTNAME!$GNULIB_GETHOSTNAME$ac_delim @@ -40667,6 +43087,7 @@ 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_LINK!$GNULIB_LINK$ac_delim GNULIB_LSEEK!$GNULIB_LSEEK$ac_delim GNULIB_READLINK!$GNULIB_READLINK$ac_delim GNULIB_SLEEP!$GNULIB_SLEEP$ac_delim @@ -40681,6 +43102,7 @@ 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_LINK!$HAVE_LINK$ac_delim HAVE_READLINK!$HAVE_READLINK$ac_delim HAVE_SLEEP!$HAVE_SLEEP$ac_delim HAVE_DECL_ENVIRON!$HAVE_DECL_ENVIRON$ac_delim @@ -40698,23 +43120,61 @@ 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 +GNULIB_SCANDIR!$GNULIB_SCANDIR$ac_delim +GNULIB_ALPHASORT!$GNULIB_ALPHASORT$ac_delim HAVE_DECL_DIRFD!$HAVE_DECL_DIRFD$ac_delim +HAVE_SCANDIR!$HAVE_SCANDIR$ac_delim +HAVE_ALPHASORT!$HAVE_ALPHASORT$ac_delim DIRENT_H!$DIRENT_H$ac_delim INCLUDE_NEXT!$INCLUDE_NEXT$ac_delim +INCLUDE_NEXT_AS_FIRST_DIRECTIVE!$INCLUDE_NEXT_AS_FIRST_DIRECTIVE$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 -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$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 +_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-2.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 ENOLINK_HIDDEN!$ENOLINK_HIDDEN$ac_delim ENOLINK_VALUE!$ENOLINK_VALUE$ac_delim EOVERFLOW_HIDDEN!$EOVERFLOW_HIDDEN$ac_delim @@ -40733,6 +43193,8 @@ 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_DPRINTF!$GNULIB_DPRINTF$ac_delim +GNULIB_VDPRINTF!$GNULIB_VDPRINTF$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 @@ -40757,47 +43219,6 @@ 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 -_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-2.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 REPLACE_PRINTF!$REPLACE_PRINTF$ac_delim REPLACE_VPRINTF!$REPLACE_VPRINTF$ac_delim REPLACE_SNPRINTF!$REPLACE_SNPRINTF$ac_delim @@ -40806,6 +43227,10 @@ 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_DPRINTF!$HAVE_DPRINTF$ac_delim +REPLACE_DPRINTF!$REPLACE_DPRINTF$ac_delim +HAVE_VDPRINTF!$HAVE_VDPRINTF$ac_delim +REPLACE_VDPRINTF!$REPLACE_VDPRINTF$ac_delim HAVE_VASPRINTF!$HAVE_VASPRINTF$ac_delim REPLACE_VASPRINTF!$REPLACE_VASPRINTF$ac_delim HAVE_DECL_OBSTACK_PRINTF!$HAVE_DECL_OBSTACK_PRINTF$ac_delim @@ -40824,6 +43249,7 @@ 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 +LIB_CLOSE!$LIB_CLOSE$ac_delim NEXT_FCNTL_H!$NEXT_FCNTL_H$ac_delim FCNTL_H!$FCNTL_H$ac_delim NEXT_FLOAT_H!$NEXT_FLOAT_H$ac_delim @@ -40844,17 +43270,59 @@ 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 +APPLE_UNIVERSAL_BUILD!$APPLE_UNIVERSAL_BUILD$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 + 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 BITSIZEOF_SIZE_T!$BITSIZEOF_SIZE_T$ac_delim +BITSIZEOF_SIG_ATOMIC_T!$BITSIZEOF_SIG_ATOMIC_T$ac_delim BITSIZEOF_WCHAR_T!$BITSIZEOF_WCHAR_T$ac_delim BITSIZEOF_WINT_T!$BITSIZEOF_WINT_T$ac_delim HAVE_SIGNED_SIG_ATOMIC_T!$HAVE_SIGNED_SIG_ATOMIC_T$ac_delim HAVE_SIGNED_WCHAR_T!$HAVE_SIGNED_WCHAR_T$ac_delim HAVE_SIGNED_WINT_T!$HAVE_SIGNED_WINT_T$ac_delim PTRDIFF_T_SUFFIX!$PTRDIFF_T_SUFFIX$ac_delim -SIG_ATOMIC_T_SUFFIX!$SIG_ATOMIC_T_SUFFIX$ac_delim SIZE_T_SUFFIX!$SIZE_T_SUFFIX$ac_delim +SIG_ATOMIC_T_SUFFIX!$SIG_ATOMIC_T_SUFFIX$ac_delim WCHAR_T_SUFFIX!$WCHAR_T_SUFFIX$ac_delim WINT_T_SUFFIX!$WINT_T_SUFFIX$ac_delim STDINT_H!$STDINT_H$ac_delim @@ -40895,47 +43363,6 @@ 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 @@ -40958,6 +43385,9 @@ REPLACE_MKSTEMP!$REPLACE_MKSTEMP$ac_delim REPLACE_PUTENV!$REPLACE_PUTENV$ac_delim REPLACE_STRTOD!$REPLACE_STRTOD$ac_delim VOID_UNSETENV!$VOID_UNSETENV$ac_delim +LOCALE_JA!$LOCALE_JA$ac_delim +LOCALE_FR_UTF8!$LOCALE_FR_UTF8$ac_delim +LOCALE_ZH_CN!$LOCALE_ZH_CN$ac_delim GNULIB_MEMMEM!$GNULIB_MEMMEM$ac_delim GNULIB_MEMPCPY!$GNULIB_MEMPCPY$ac_delim GNULIB_MEMRCHR!$GNULIB_MEMRCHR$ac_delim @@ -40980,6 +43410,47 @@ GNULIB_MBSRCHR!$GNULIB_MBSRCHR$ac_delim GNULIB_MBSSTR!$GNULIB_MBSSTR$ac_delim GNULIB_MBSCASECMP!$GNULIB_MBSCASECMP$ac_delim GNULIB_MBSNCASECMP!$GNULIB_MBSNCASECMP$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-4.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_MBSPCASECMP!$GNULIB_MBSPCASECMP$ac_delim GNULIB_MBSCASESTR!$GNULIB_MBSCASESTR$ac_delim GNULIB_MBSCSPN!$GNULIB_MBSCSPN$ac_delim @@ -41018,6 +43489,7 @@ 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_RANDOM_H!$HAVE_RANDOM_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 @@ -41033,55 +43505,10 @@ 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 - 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-4.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 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 HAVE_UNISTD_H!$HAVE_UNISTD_H$ac_delim -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 @@ -41121,13 +43548,54 @@ BACKUP_LIBEXEC_SCRIPTS!$BACKUP_LIBEXEC_SCRIPTS$ac_delim BACKUP_SBIN_SCRIPTS!$BACKUP_SBIN_SCRIPTS$ac_delim BACKUP_SED_COND!$BACKUP_SED_COND$ac_delim LTLIBOBJS!$LTLIBOBJS$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-5.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 gl_LIBOBJS!$gl_LIBOBJS$ac_delim gl_LTLIBOBJS!$gl_LTLIBOBJS$ac_delim 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` = 51; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -41145,7 +43613,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-6.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -41414,7 +43882,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" | sed -f "$tmp/subs-5.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" | sed -f "$tmp/subs-6.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 6912812..762f8e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # 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. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AC_INIT([GNU tar], [1.21], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.22], [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 c01077a..cfee88e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -40,9 +40,10 @@ subdir = doc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/stamp-vti $(srcdir)/version.texi $(tar_TEXINFOS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ @@ -75,50 +76,52 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbscasecmp.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ + $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbscasecmp.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.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/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/multiarch.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/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/size_max.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/wcrtomb.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 \ @@ -155,6 +158,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -203,11 +207,14 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DIRFD = @GNULIB_DIRFD@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ @@ -242,19 +249,25 @@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LINK = @GNULIB_LINK@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ GNULIB_MBSCHR = @GNULIB_MBSCHR@ GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ GNULIB_MBSLEN = @GNULIB_MBSLEN@ GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ @@ -279,6 +292,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANDIR = @GNULIB_SCANDIR@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ @@ -306,16 +320,23 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ 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_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ATOLL = @HAVE_ATOLL@ +HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ @@ -339,7 +360,9 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ @@ -355,17 +378,25 @@ HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHMOD = @HAVE_LCHMOD@ +HAVE_LINK = @HAVE_LINK@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ +HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOWC = @HAVE_MBRTOWC@ +HAVE_MBSINIT = @HAVE_MBSINIT@ +HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_H = @HAVE_RANDOM_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_SCANDIR = @HAVE_SCANDIR@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -397,11 +428,16 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ +HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ +HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ INCLUDE_NEXT = @INCLUDE_NEXT@ +INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -420,8 +456,13 @@ LIBS = @LIBS@ LIBTAR_LIBDEPS = @LIBTAR_LIBDEPS@ LIBTAR_LTLIBDEPS = @LIBTAR_LTLIBDEPS@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_CLOSE = @LIB_CLOSE@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOCALE_FR = @LOCALE_FR@ +LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ +LOCALE_JA = @LOCALE_JA@ +LOCALE_ZH_CN = @LOCALE_ZH_CN@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -463,8 +504,10 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ +REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ @@ -484,6 +527,12 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ +REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +REPLACE_MBSINIT = @REPLACE_MBSINIT@ +REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ @@ -505,10 +554,14 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ +REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ +REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ diff --git a/doc/getdate.texi b/doc/getdate.texi index 7175e3d..e794780 100644 --- a/doc/getdate.texi +++ b/doc/getdate.texi @@ -4,7 +4,7 @@ @c 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @c Permission is granted to copy, distribute and/or modify this document -@c under the terms of the GNU Free Documentation License, Version 1.2 or +@c under the terms of the GNU Free Documentation License, Version 1.3 or @c any later version published by the Free Software Foundation; with no @c Invariant Sections, with no Front-Cover Texts, and with no Back-Cover @c Texts. A copy of the license is included in the ``GNU Free diff --git a/doc/stamp-vti b/doc/stamp-vti index eb2c3a0..d015a3c 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 30 October 2008 -@set UPDATED-MONTH October 2008 -@set EDITION 1.21 -@set VERSION 1.21 +@set UPDATED 5 March 2009 +@set UPDATED-MONTH March 2009 +@set EDITION 1.22 +@set VERSION 1.22 diff --git a/doc/tar.info b/doc/tar.info index 9f26ab4..0dd4e8d 100644 --- a/doc/tar.info +++ b/doc/tar.info @@ -1,10 +1,10 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.21, 30 October 2008), which +This manual is for GNU `tar' (version 1.22, 5 March 2009), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, -2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -30,376 +30,377 @@ END-INFO-DIR-ENTRY  Indirect: -tar.info-1: 1243 -tar.info-2: 300672 +tar.info-1: 1246 +tar.info-2: 300776  Tag Table: (Indirect) -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 +Node: Top1246 +Node: Introduction10516 +Node: Book Contents11303 +Node: Definitions13475 +Node: What tar Does15278 +Node: Naming tar Archives18044 +Node: Authors18764 +Node: Reports20577 +Node: Tutorial20937 +Node: assumptions21750 +Node: stylistic conventions24225 +Node: basic tar options24668 +Node: frequent operations28306 +Node: Two Frequent Options28958 +Node: file tutorial29589 +Node: verbose tutorial30950 +Ref: verbose member listing33164 +Node: help tutorial35917 +Node: create36271 +Node: prepare for examples37772 +Node: Creating the archive39540 +Node: create verbose42372 +Node: short create43193 +Node: create dir45946 +Node: list48653 +Ref: listing member and file names49927 +Node: list dir52208 +Node: extract53197 +Node: extracting archives54374 +Node: extracting files54864 +Ref: extracting files-Footnote-157511 +Node: extract dir57891 +Node: extracting untrusted archives60274 +Node: failing commands61153 +Node: going further62253 +Node: tar invocation62466 +Node: Synopsis63978 +Node: using tar options68947 +Ref: TAR_OPTIONS70532 +Node: Styles71549 +Node: Long Options73261 +Node: Short Options75433 +Ref: Short Options-Footnote-177241 +Node: Old Options77458 +Ref: Old Options-Footnote-180408 +Node: Mixing80578 +Ref: Mixing-Footnote-182944 +Node: All Options83064 +Node: Operation Summary83669 +Ref: --append83789 +Ref: --catenate83869 +Ref: --compare83940 +Ref: --concatenate84143 +Ref: --create84253 +Ref: --delete84321 +Ref: --diff84434 +Ref: --extract84490 +Ref: --get84592 +Ref: --list84650 +Ref: --update84718 +Node: Option Summary84928 +Ref: --absolute-names85083 +Ref: --after-date85261 +Ref: --anchored85313 +Ref: --atime-preserve85446 +Ref: --auto-compress87961 +Ref: --backup88188 +Ref: --block-number88379 +Ref: --blocking-factor88553 +Ref: --bzip288705 +Ref: --check-device88812 +Ref: --checkpoint89007 +Ref: --checkpoint-action89448 +Ref: --check-links90599 +Ref: --compress90876 +Ref: --uncompress90876 +Ref: --confirmation91080 +Ref: --delay-directory-restore91148 +Ref: --dereference91349 +Ref: --directory91534 +Ref: --exclude91787 +Ref: --exclude-from91906 +Ref: --exclude-caches92052 +Ref: --exclude-caches-under92246 +Ref: --exclude-caches-all92424 +Ref: --exclude-tag92553 +Ref: --exclude-tag-under92708 +Ref: --exclude-tag-all92876 +Ref: --exclude-vcs92990 +Ref: --file93145 +Ref: --files-from93345 +Ref: --force-local93548 +Ref: --format93739 +Ref: --group94409 +Ref: --gzip94757 +Ref: --gunzip94757 +Ref: --ungzip94757 +Ref: --hard-dereference94980 +Ref: --help95167 +Ref: --ignore-case95301 +Ref: --ignore-command-error95428 +Ref: --ignore-failed-read95539 +Ref: --ignore-zeros95669 +Ref: --incremental95814 +Ref: --index-file96079 +Ref: --info-script96164 +Ref: --new-volume-script96164 +Ref: --interactive96485 +Ref: --keep-newer-files96697 +Ref: --keep-old-files96839 +Ref: --label96970 +Ref: --listed-incremental97258 +Ref: --lzma97622 +Ref: --mode97822 +Ref: --mtime98113 +Ref: --multi-volume98554 +Ref: --newer98755 +Ref: --newer-mtime99033 +Ref: --no-anchored99257 +Ref: --no-auto-compress99394 +Ref: --no-check-device99545 +Ref: --no-delay-directory-restore99728 +Ref: --no-ignore-case99981 +Ref: --no-ignore-command-error100074 +Ref: --no-null100229 +Ref: --no-overwrite-dir100434 +Ref: --no-quote-chars100577 +Ref: --no-recursion100758 +Ref: --no-same-owner100863 +Ref: --no-same-permissions101046 +Ref: --no-unquote101248 +Ref: --no-wildcards101386 +Ref: --no-wildcards-match-slash101470 +Ref: --null101572 +Ref: --numeric-owner101800 +Ref: --occurrence102451 +Ref: --old-archive103018 +Ref: --one-file-system103067 +Ref: --overwrite103245 +Ref: --overwrite-dir103387 +Ref: --owner103532 +Ref: --pax-option103911 +Ref: --portability104210 +Ref: --posix104275 +Ref: --preserve104317 +Ref: --preserve-order104455 +Ref: --preserve-permissions104519 +Ref: --same-permissions104519 +Ref: --quote-chars104933 +Ref: --quoting-style105086 +Ref: --read-full-records105407 +Ref: --record-size105572 +Ref: --recursion105703 +Ref: --recursive-unlink105806 +Ref: --remove-files105973 +Ref: --restrict106119 +Ref: --rmt-command106307 +Ref: --rsh-command106448 +Ref: --same-order106570 +Ref: --same-owner106862 +Ref: --seek107239 +Ref: --show-defaults107496 +Ref: --show-omitted-dirs107864 +Ref: --show-transformed-names108018 +Ref: --show-stored-names108018 +Ref: --sparse108407 +Ref: --sparse-version108546 +Ref: --starting-file108770 +Ref: --strip-components108959 +Ref: --suffix109271 +Ref: --tape-length109406 +Ref: --test-label109561 +Ref: --to-command109713 +Ref: --to-stdout109872 +Ref: --totals110025 +Ref: --touch110256 +Ref: --transform110458 +Ref: --xform110458 +Ref: --unlink-first111069 +Ref: --unquote111237 +Ref: --use-compress-program111344 +Ref: --utc111522 +Ref: --verbose111615 +Ref: --verify111867 +Ref: --version111985 +Ref: --volno-file112157 +Ref: --wildcards112344 +Ref: --wildcards-match-slash112464 +Ref: --xz112556 +Ref: Option Summary-Footnote-1112687 +Node: Short Option Summary112905 +Node: help115106 +Ref: help-Footnote-1118936 +Node: defaults119146 +Node: verbose120163 +Ref: totals122464 +Ref: Progress information124054 +Ref: show-omitted-dirs125033 +Ref: block-number125452 +Ref: verbose-Footnote-1126479 +Node: checkpoints126586 +Node: interactive131983 +Node: operations134066 +Node: Basic tar134325 +Ref: Basic tar-Footnote-1137429 +Node: Advanced tar137573 +Node: Operations138418 +Node: append140388 +Ref: append-Footnote-1143553 +Node: appending files143719 +Node: multiple145500 +Node: update148190 +Node: how to update149229 +Node: concatenate151012 +Ref: concatenate-Footnote-1154261 +Node: delete154399 +Node: compare156242 +Node: create options157732 +Node: override158190 +Node: Ignore Failed Read161628 +Node: extract options161848 +Node: Reading162744 +Node: read full records164307 +Node: Ignore Zeros164643 +Node: Writing165634 +Node: Dealing with Old Files166191 +Node: Overwrite Old Files168618 +Node: Keep Old Files170075 +Node: Keep Newer Files170585 +Node: Unlink First170875 +Node: Recursive Unlink171279 +Node: Data Modification Times171832 +Node: Setting Access Permissions172642 +Node: Directory Modification Times and Permissions173274 +Node: Writing to Standard Output176880 +Node: Writing to an External Program178415 +Node: remove files181152 +Node: Scarce181345 +Node: Starting File181593 +Node: Same Order182413 +Node: backup183249 +Node: Applications186473 +Node: looking ahead187986 +Node: Backups188812 +Node: Full Dumps190644 +Node: Incremental Dumps192450 +Ref: device numbers195586 +Ref: incremental-op199568 +Ref: Incremental Dumps-Footnote-1199942 +Ref: Incremental Dumps-Footnote-2200092 +Node: Backup Levels200579 +Node: Backup Parameters202966 +Node: General-Purpose Variables204147 +Ref: RSH207304 +Node: Magnetic Tape Control209183 +Node: User Hooks210520 +Node: backup-specs example211848 +Node: Scripted Backups212991 +Ref: Scripted Backups-Footnote-1215853 +Node: Scripted Restoration216237 +Node: Choosing218845 +Node: file220030 +Ref: remote-dev222729 +Ref: local and remote archives223121 +Node: Selecting Archive Members224151 +Ref: input name quoting224832 +Node: files226818 +Ref: files-Footnote-1230092 +Node: nul230250 +Node: exclude232649 +Node: problems with exclude237611 +Node: wildcards239656 +Node: controlling pattern-matching242240 +Ref: controlling pattern-matching-Footnote-1246230 +Node: quoting styles246446 +Ref: escape sequences246792 +Node: transform252927 +Ref: show-transformed-names254916 +Node: after261105 +Node: recurse264770 +Node: one267539 +Node: directory269035 +Node: absolute272108 +Ref: absolute-Footnote-1275242 +Node: Date input formats275593 +Node: General date syntax277909 +Node: Calendar date items280860 +Node: Time of day items282857 +Node: Time zone items285053 +Node: Day of week items286287 +Node: Relative items in date strings287276 +Node: Pure numbers in date strings290078 +Node: Seconds since the Epoch291059 +Node: Specifying time zone rules292680 +Node: Authors of get_date295044 +Node: Formats295796 +Node: Compression300484 +Node: gzip300776 +Ref: auto-compress303938 +Ref: gzip-Footnote-1307972 +Node: sparse308021 +Node: Attributes311075 +Node: Portability316996 +Node: Portable Names318482 +Node: dereference319187 +Node: hard links320588 +Ref: hard links-Footnote-1323546 +Node: old323602 +Node: ustar324786 +Node: gnu325377 +Node: posix326254 +Node: PAX keywords326735 +Node: Checksumming331063 +Node: Large or Negative Values332987 +Node: Other Tars334587 +Node: Split Recovery335723 +Node: Sparse Recovery339455 +Ref: extracting sparse v.0.x343088 +Ref: Sparse Recovery-Footnote-1346377 +Ref: Sparse Recovery-Footnote-2346400 +Node: cpio346521 +Node: Media351277 +Node: Device353207 +Node: Remote Tape Server358275 +Node: Common Problems and Solutions362005 +Node: Blocking362397 +Node: Format Variations368904 +Node: Blocking Factor369816 +Node: Many381470 +Node: Tape Positioning385264 +Node: mt387137 +Node: Using Multiple Tapes388692 +Node: Multi-Volume Archives390758 +Ref: tape-length392243 +Ref: change volume prompt392547 +Ref: volno-file393417 +Ref: info-script393969 +Ref: Multi-Volume Archives-Footnote-1399153 +Ref: Multi-Volume Archives-Footnote-2399263 +Node: Tape Files399330 +Node: Tarcat400813 +Node: label401858 +Ref: --test-label option403487 +Ref: label-Footnote-1406532 +Node: verify406767 +Node: Write Protection410067 +Node: Changes410897 +Node: Configuring Help Summary414482 +Node: Fixing Snapshot Files420983 +Node: Tar Internals423168 +Node: Standard423500 +Node: Extensions445701 +Node: Sparse Formats448261 +Node: Old GNU Format449551 +Node: PAX 0451962 +Node: PAX 1455089 +Node: Snapshot Files456823 +Node: Dumpdir461276 +Node: Genfile464522 +Node: Generate Mode465615 +Node: Status Mode469912 +Node: Exec Mode471711 +Node: Free Software Needs Free Documentation473947 +Node: Copying This Manual478918 +Node: GNU Free Documentation License479200 +Node: Index of Command Line Options501607 +Node: Index525923  End Tag Table diff --git a/doc/tar.info-1 b/doc/tar.info-1 index 891413b..c9d9aab 100644 --- a/doc/tar.info-1 +++ b/doc/tar.info-1 @@ -1,10 +1,10 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.21, 30 October 2008), which +This manual is for GNU `tar' (version 1.22, 5 March 2009), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, -2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -34,11 +34,11 @@ File: tar.info, Node: Top, Next: Introduction, Up: (dir) GNU tar: an archiver tool ************************* -This manual is for GNU `tar' (version 1.21, 30 October 2008), which +This manual is for GNU `tar' (version 1.22, 5 March 2009), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, -2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -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.21 +to create version 1.12. The book for versions from 1.14 up to 1.22 were edited by the current maintainer, Sergey Poznyakoff. For version 1.12, Daniel Hagerty contributed a great deal of @@ -2495,7 +2495,6 @@ 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::. @@ -2878,6 +2877,7 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera input name quoting::. `--use-compress-program=PROG' +`-I=PROG' Instructs `tar' to access the archive through PROG, which is presumed to be a compression program of some sort. *Note gzip::. @@ -2914,6 +2914,12 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera `--wildcards-match-slash' Wildcards match `/'. *Note controlling pattern-matching::. +`--xz' +`-J' + Use `xz' for compressing or decompressing the archives. *Note + gzip::. + + ---------- Footnotes ---------- (1) Earlier versions of GNU `tar' understood `-l' as a synonym for @@ -2937,7 +2943,7 @@ Short Option Reference -C *note --directory::. -F *note --info-script::. -G *note --incremental::. --J *note --lzma::. +-J *note --xz::. -K *note --starting-file::. -L *note --tape-length::. -M *note --multi-volume::. @@ -2992,7 +2998,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.21 + tar (GNU tar) 1.22 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 . @@ -3558,7 +3564,7 @@ where the last chapter left them.) Add new entries to an archive that already exists. `--update' -`-r' +`-u' Add more recent copies of archive members to the end of an archive, if they exist. @@ -5935,7 +5941,7 @@ difficult to catch using text editors. systems: `CVS', `RCS', `SCCS', `SVN', `Arch', `Bazaar', `Mercurial', and `Darcs'. - As of version 1.21, the following files are excluded: + As of version 1.22, the following files are excluded: * `CVS/', and everything under it @@ -7590,7 +7596,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.21 and Automake prior to 1.9. + 1.22 and Automake prior to 1.9. ustar Archive format defined by POSIX.1-1988 specification. It stores diff --git a/doc/tar.info-2 b/doc/tar.info-2 index 5720541..dfdf504 100644 --- a/doc/tar.info-2 +++ b/doc/tar.info-2 @@ -1,10 +1,10 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.21, 30 October 2008), which +This manual is for GNU `tar' (version 1.22, 5 March 2009), which creates and extracts files from archives. Copyright (C) 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2003, -2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -44,9 +44,9 @@ effective than other compression programs(1). "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: +(`--xz') to create an XZ archive, `--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 . @@ -123,6 +123,7 @@ multi-volume archives cannot be compressed. `.lzma' `lzma' `.tlz' `lzma' `.lzo' `lzop' + `.xz' `xz' `-z' `--gzip' @@ -158,12 +159,15 @@ multi-volume archives cannot be compressed. would have make recovering easier. So, there are pros and cons. We'll see! +`-J' +`--xz' + Filter the archive through `xz'. Otherwise like `--gzip'. + `-j' `--bzip2' Filter the archive through `bzip2'. Otherwise like `--gzip'. `--lzma' -`-J' Filter the archive through `lzma'. Otherwise like `--gzip'. `--lzop' @@ -175,6 +179,7 @@ multi-volume archives cannot be compressed. Filter the archive through `compress'. Otherwise like `--gzip'. `--use-compress-program=PROG' +`-I=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: @@ -203,11 +208,11 @@ PGP encryption on top of compression, using `gpg' (*note gpg: Then the following command will create a compressed archive signed with your private key: - $ tar -cf foo.tar.gpgz --use-compress=gpgz . + $ tar -cf foo.tar.gpgz -Igpgz . -Likewise, the following command will list its contents: +Likewise, the command below will list its contents: - $ tar -tf foo.tar.gpgz --use-compress=gpgz . + $ tar -tf foo.tar.gpgz -Igpgz . ---------- Footnotes ---------- @@ -406,8 +411,8 @@ access time retroactively or avoid changing it in the first place. `--preserve' Same as both `--same-permissions' and `--same-order'. - The `--preserve' option has no equivalent short option name. It - is equivalent to `--same-permissions' plus `--same-order'. + This option is deprecated, and will be removed in GNU `tar' + version 1.23.  @@ -2529,7 +2534,7 @@ Appendix A Changes ****************** This appendix lists some important user-visible changes between version -GNU `tar' 1.21 and previous versions. An up-to-date version of this +GNU `tar' 1.22 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). @@ -3565,12 +3570,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.21 supports three snapshot file formats. The + GNU `tar' version 1.22 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.21, the "format 2" is used. +version 1.16 and up to 1.22, the "format 2" is used. GNU `tar' is able to read all three formats, but will create snapshots only in format 2. @@ -3626,7 +3631,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.21-2 + GNU tar-1.22-2 This line is followed by newline. Rest of file consists of records, separated by null (ASCII 0) characters. Thus, in contrast @@ -4627,7 +4632,7 @@ Summary::. * block-number, summary: Option Summary. (line 76) * blocking-factor: Blocking Factor. (line 8) * blocking-factor, summary: Option Summary. (line 82) -* bzip2: gzip. (line 130) +* bzip2: gzip. (line 131) * bzip2, summary: Option Summary. (line 87) * catenate: concatenate. (line 6) * catenate, summary: Operation Summary. (line 10) @@ -4643,7 +4648,7 @@ Summary::. * checkpoint-action, summary: Option Summary. (line 105) * compare: compare. (line 8) * compare, summary: Operation Summary. (line 14) -* compress: gzip. (line 141) +* compress: gzip. (line 145) * compress, summary: Option Summary. (line 152) * concatenate: concatenate. (line 6) * concatenate, summary: Operation Summary. (line 20) @@ -4704,7 +4709,7 @@ Summary::. * group: override. (line 73) * group, summary: Option Summary. (line 266) * gunzip, summary: Option Summary. (line 274) -* gzip: gzip. (line 96) +* gzip: gzip. (line 97) * gzip, summary: Option Summary. (line 274) * hard-dereference, described: hard links. (line 61) * hard-dereference, summary: Option Summary. (line 282) @@ -4750,169 +4755,169 @@ Summary::. * listed-incremental, using with --extract: Incremental Dumps. (line 112) * listed-incremental, using with --list: Incremental Dumps. (line 177) -* lzma: gzip. (line 134) +* lzma: gzip. (line 139) * lzma, summary: Option Summary. (line 359) -* lzop: gzip. (line 138) +* lzop: gzip. (line 142) * mode: override. (line 14) -* mode, summary: Option Summary. (line 368) +* mode, summary: Option Summary. (line 367) * mtime: override. (line 29) -* mtime, summary: Option Summary. (line 374) +* mtime, summary: Option Summary. (line 373) * multi-volume: Multi-Volume Archives. (line 6) * multi-volume, short description: Device. (line 88) -* multi-volume, summary: Option Summary. (line 383) +* multi-volume, summary: Option Summary. (line 382) * new-volume-script: Multi-Volume Archives. (line 80) * new-volume-script, short description: Device. (line 104) * new-volume-script, summary: Option Summary. (line 320) * newer: after. (line 26) -* newer, summary: Option Summary. (line 391) +* newer, summary: Option Summary. (line 390) * newer-mtime: after. (line 37) -* newer-mtime, summary: Option Summary. (line 399) +* newer-mtime, summary: Option Summary. (line 398) * no-anchored: controlling pattern-matching. (line 79) -* no-anchored, summary: Option Summary. (line 404) -* no-auto-compress, summary: Option Summary. (line 408) +* no-anchored, summary: Option Summary. (line 403) +* no-auto-compress, summary: Option Summary. (line 407) * no-check-device, described: Incremental Dumps. (line 95) -* no-check-device, summary: Option Summary. (line 412) +* no-check-device, summary: Option Summary. (line 411) * no-delay-directory-restore: Directory Modification Times and Permissions. (line 68) -* no-delay-directory-restore, summary: Option Summary. (line 417) +* no-delay-directory-restore, summary: Option Summary. (line 416) * no-ignore-case: controlling pattern-matching. (line 86) -* no-ignore-case, summary: Option Summary. (line 423) +* no-ignore-case, summary: Option Summary. (line 422) * no-ignore-command-error: Writing to an External Program. (line 87) -* no-ignore-command-error, summary: Option Summary. (line 426) +* no-ignore-command-error, summary: Option Summary. (line 425) * 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-null, summary: Option Summary. (line 429) +* no-overwrite-dir, summary: Option Summary. (line 434) +* no-quote-chars, summary: Option Summary. (line 438) * no-recursion: recurse. (line 13) -* no-recursion, summary: Option Summary. (line 444) +* no-recursion, summary: Option Summary. (line 443) * no-same-owner: Attributes. (line 67) -* no-same-owner, summary: Option Summary. (line 448) -* no-same-permissions, summary: Option Summary. (line 454) +* no-same-owner, summary: Option Summary. (line 447) +* no-same-permissions, summary: Option Summary. (line 453) * no-unquote: Selecting Archive Members. (line 42) -* no-unquote, summary: Option Summary. (line 459) +* no-unquote, summary: Option Summary. (line 458) * no-wildcards: controlling pattern-matching. (line 41) -* no-wildcards, summary: Option Summary. (line 463) +* no-wildcards, summary: Option Summary. (line 462) * no-wildcards-match-slash: controlling pattern-matching. (line 92) -* no-wildcards-match-slash, summary: Option Summary. (line 466) +* no-wildcards-match-slash, summary: Option Summary. (line 465) * null, described: nul. (line 11) -* null, summary: Option Summary. (line 469) +* null, summary: Option Summary. (line 468) * numeric-owner: Attributes. (line 73) -* numeric-owner, summary: Option Summary. (line 475) -* occurrence, summary: Option Summary. (line 492) -* old-archive, summary: Option Summary. (line 506) +* numeric-owner, summary: Option Summary. (line 474) +* occurrence, summary: Option Summary. (line 491) +* old-archive, summary: Option Summary. (line 505) * one-file-system: one. (line 16) -* one-file-system, summary: Option Summary. (line 509) +* one-file-system, summary: Option Summary. (line 508) * overwrite: Overwrite Old Files. (line 6) * overwrite, introduced: Dealing with Old Files. (line 22) -* overwrite, summary: Option Summary. (line 514) +* overwrite, summary: Option Summary. (line 513) * overwrite-dir: Overwrite Old Files. (line 28) * overwrite-dir, introduced: Dealing with Old Files. (line 6) -* overwrite-dir, summary: Option Summary. (line 518) +* overwrite-dir, summary: Option Summary. (line 517) * owner: override. (line 57) -* owner, summary: Option Summary. (line 522) +* owner, summary: Option Summary. (line 521) * pax-option: PAX keywords. (line 6) -* pax-option, summary: Option Summary. (line 531) -* portability, summary: Option Summary. (line 537) -* posix, summary: Option Summary. (line 541) +* pax-option, summary: Option Summary. (line 530) +* portability, summary: Option Summary. (line 536) +* posix, summary: Option Summary. (line 540) * preserve: Attributes. (line 126) -* preserve, summary: Option Summary. (line 544) +* preserve, summary: Option Summary. (line 543) * preserve-order: Same Order. (line 6) -* preserve-order, summary: Option Summary. (line 548) +* preserve-order, summary: Option Summary. (line 547) * preserve-permissions: Setting Access Permissions. (line 10) * preserve-permissions, short description: Attributes. (line 113) -* preserve-permissions, summary: Option Summary. (line 551) -* quote-chars, summary: Option Summary. (line 561) +* preserve-permissions, summary: Option Summary. (line 550) +* quote-chars, summary: Option Summary. (line 560) * quoting-style: quoting styles. (line 38) -* quoting-style, summary: Option Summary. (line 565) +* quoting-style, summary: Option Summary. (line 564) * 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 572) -* record-size, summary: Option Summary. (line 577) +* read-full-records, summary: Option Summary. (line 571) +* record-size, summary: Option Summary. (line 576) * recursion: recurse. (line 24) -* recursion, summary: Option Summary. (line 581) +* recursion, summary: Option Summary. (line 580) * recursive-unlink: Recursive Unlink. (line 6) -* recursive-unlink, summary: Option Summary. (line 585) +* recursive-unlink, summary: Option Summary. (line 584) * remove-files: remove files. (line 6) -* remove-files, summary: Option Summary. (line 590) -* restrict, summary: Option Summary. (line 594) -* rmt-command, summary: Option Summary. (line 599) +* remove-files, summary: Option Summary. (line 589) +* restrict, summary: Option Summary. (line 593) +* rmt-command, summary: Option Summary. (line 598) * rsh-command: Device. (line 73) -* rsh-command, summary: Option Summary. (line 603) +* rsh-command, summary: Option Summary. (line 602) * same-order: Same Order. (line 6) -* same-order, summary: Option Summary. (line 607) +* same-order, summary: Option Summary. (line 606) * same-owner: Attributes. (line 48) -* same-owner, summary: Option Summary. (line 615) +* same-owner, summary: Option Summary. (line 614) * same-permissions: Setting Access Permissions. (line 10) * same-permissions, short description: Attributes. (line 113) -* same-permissions, summary: Option Summary. (line 551) -* seek, summary: Option Summary. (line 624) +* same-permissions, summary: Option Summary. (line 550) +* seek, summary: Option Summary. (line 623) * show-defaults: defaults. (line 6) -* show-defaults, summary: Option Summary. (line 631) +* show-defaults, summary: Option Summary. (line 630) * show-omitted-dirs: verbose. (line 107) -* show-omitted-dirs, summary: Option Summary. (line 640) +* show-omitted-dirs, summary: Option Summary. (line 639) * show-stored-names: list. (line 60) -* show-stored-names, summary: Option Summary. (line 644) +* show-stored-names, summary: Option Summary. (line 643) * show-transformed-names: transform. (line 45) -* show-transformed-names, summary: Option Summary. (line 644) +* show-transformed-names, summary: Option Summary. (line 643) * sparse: sparse. (line 22) -* sparse, summary: Option Summary. (line 652) +* sparse, summary: Option Summary. (line 651) * sparse-version: sparse. (line 57) -* sparse-version, summary: Option Summary. (line 657) +* sparse-version, summary: Option Summary. (line 656) * starting-file: Starting File. (line 6) -* starting-file, summary: Option Summary. (line 662) +* starting-file, summary: Option Summary. (line 661) * strip-components: transform. (line 25) -* strip-components, summary: Option Summary. (line 668) +* strip-components, summary: Option Summary. (line 667) * suffix: backup. (line 68) -* suffix, summary: Option Summary. (line 677) +* suffix, summary: Option Summary. (line 676) * tape-length: Multi-Volume Archives. (line 33) * tape-length, short description: Device. (line 96) -* tape-length, summary: Option Summary. (line 683) +* tape-length, summary: Option Summary. (line 682) * test-label: label. (line 37) -* test-label, summary: Option Summary. (line 688) +* test-label, summary: Option Summary. (line 687) * to-command: Writing to an External Program. (line 9) -* to-command, summary: Option Summary. (line 692) +* to-command, summary: Option Summary. (line 691) * to-stdout: Writing to Standard Output. (line 14) -* to-stdout, summary: Option Summary. (line 696) +* to-stdout, summary: Option Summary. (line 695) * totals: verbose. (line 46) -* totals, summary: Option Summary. (line 701) +* totals, summary: Option Summary. (line 700) * touch <1>: Attributes. (line 37) * touch: Data Modification Times. (line 15) -* touch, summary: Option Summary. (line 706) +* touch, summary: Option Summary. (line 705) * transform: transform. (line 74) -* transform, summary: Option Summary. (line 712) -* uncompress: gzip. (line 141) +* transform, summary: Option Summary. (line 711) +* uncompress: gzip. (line 145) * uncompress, summary: Option Summary. (line 152) -* ungzip: gzip. (line 96) +* ungzip: gzip. (line 97) * 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 732) +* unlink-first, summary: Option Summary. (line 731) * unquote: Selecting Archive Members. (line 39) -* unquote, summary: Option Summary. (line 738) +* unquote, summary: Option Summary. (line 737) * update: update. (line 8) * update, summary: Operation Summary. (line 50) * usage: help. (line 53) -* use-compress-program: gzip. (line 146) -* use-compress-program, summary: Option Summary. (line 742) +* use-compress-program: gzip. (line 150) +* use-compress-program, summary: Option Summary. (line 741) * utc, summary: Option Summary. (line 746) * verbose: verbose. (line 18) * verbose, introduced: verbose tutorial. (line 6) @@ -4934,7 +4939,8 @@ Summary::. (line 92) * wildcards-match-slash, summary: Option Summary. (line 776) * xform: transform. (line 74) -* xform, summary: Option Summary. (line 712) +* xform, summary: Option Summary. (line 711) +* xz, summary: Option Summary. (line 779)  File: tar.info, Node: Index, Prev: Index of Command Line Options, Up: Top @@ -5006,7 +5012,7 @@ Appendix I Index * Compressed archives: gzip. (line 6) * concatenate vs cat: concatenate. (line 63) * Concatenating Archives: concatenate. (line 6) -* corrupted archives <1>: gzip. (line 115) +* corrupted archives <1>: gzip. (line 116) * corrupted archives: Full Dumps. (line 8) * Creation of the archive: create. (line 8) * CVS, excluding files: exclude. (line 39) @@ -5122,8 +5128,8 @@ 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 158) -* gpg, using with tar: gzip. (line 158) +* gnupg, using with tar: gzip. (line 163) +* gpg, using with tar: gzip. (line 163) * gzip: gzip. (line 6) * hard links, dereferencing: hard links. (line 8) * header-col: Configuring Help Summary. @@ -5387,7 +5393,7 @@ Appendix I Index * Updating an archive: update. (line 8) * usage-indent: Configuring Help Summary. (line 154) -* Using encrypted archives: gzip. (line 158) +* Using encrypted archives: gzip. (line 163) * 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 cb8bd19..7d8952b 100644 --- a/doc/tar.texi +++ b/doc/tar.texi @@ -35,7 +35,7 @@ This manual is for @acronym{GNU} @command{tar} (version from archives. Copyright @copyright{} 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2001, -2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -2786,7 +2786,6 @@ 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}. @@ -3309,6 +3308,7 @@ name quoting}. @opsummary{use-compress-program} @item --use-compress-program=@var{prog} +@itemx -I=@var{prog} Instructs @command{tar} to access the archive through @var{prog}, which is presumed to be a compression program of some sort. @xref{gzip}. @@ -3358,6 +3358,12 @@ Use wildcards when matching member names with patterns. @item --wildcards-match-slash Wildcards match @samp{/}. @xref{controlling pattern-matching}. + +@opsummary{xz} +@item --xz +@itemx -J +Use @command{xz} for compressing or decompressing the archives. @xref{gzip}. + @end table @node Short Option Summary @@ -3379,7 +3385,7 @@ them with the equivalent long option. @item -G @tab @ref{--incremental}. -@item -J @tab @ref{--lzma}. +@item -J @tab @ref{--xz}. @item -K @tab @ref{--starting-file}. @@ -4138,7 +4144,7 @@ The five operations that we will cover in this chapter are: @itemx -r Add new entries to an archive that already exists. @item --update -@itemx -r +@itemx -u Add more recent copies of archive members to the end of an archive, if they exist. @item --concatenate @@ -8405,7 +8411,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{-J} (@option{--lzma}) to create an @asis{LZMA} compressed +@option{-J} (@option{--xz}) to create an @asis{XZ} archive, +@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: @@ -8503,6 +8510,7 @@ suffix. The following suffixes are recognized: @item @samp{.lzma} @tab @command{lzma} @item @samp{.tlz} @tab @command{lzma} @item @samp{.lzo} @tab @command{lzop} +@item @samp{.xz} @tab @command{xz} @end multitable @opindex gzip @@ -8547,13 +8555,17 @@ lose some compressibility. But this would have make recovering easier. So, there are pros and cons. We'll see! @opindex bzip2 +@item -J +@itemx --xz +Filter the archive through @code{xz}. Otherwise like +@option{--gzip}. + @item -j @itemx --bzip2 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 @@ -8570,6 +8582,7 @@ Filter the archive through @command{compress}. Otherwise like @option{--gzip}. @opindex use-compress-program @item --use-compress-program=@var{prog} +@itemx -I=@var{prog} Use external compression program @var{prog}. Use this option if you have a compression program that @GNUTAR{} does not support. There are two requirements to which @var{prog} should comply: @@ -8608,14 +8621,14 @@ Suppose you name it @file{gpgz} and save it somewhere in your archive signed with your private key: @smallexample -$ @kbd{tar -cf foo.tar.gpgz --use-compress=gpgz .} +$ @kbd{tar -cf foo.tar.gpgz -Igpgz .} @end smallexample @noindent -Likewise, the following command will list its contents: +Likewise, the command below will list its contents: @smallexample -$ @kbd{tar -tf foo.tar.gpgz --use-compress=gpgz .} +$ @kbd{tar -tf foo.tar.gpgz -Igpgz .} @end smallexample @ignore @@ -8887,11 +8900,7 @@ This option is meaningless with @option{--list} (@option{-t}). @item --preserve Same as both @option{--same-permissions} and @option{--same-order}. -The @option{--preserve} option has no equivalent short option name. -It is equivalent to @option{--same-permissions} plus @option{--same-order}. - -@FIXME{I do not see the purpose of such an option. (Neither I. FP.) -Neither do I. --Sergey} +This option is deprecated, and will be removed in @GNUTAR{} version 1.23. @end table diff --git a/doc/version.texi b/doc/version.texi index eb2c3a0..d015a3c 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 30 October 2008 -@set UPDATED-MONTH October 2008 -@set EDITION 1.21 -@set VERSION 1.21 +@set UPDATED 5 March 2009 +@set UPDATED-MONTH March 2009 +@set EDITION 1.22 +@set VERSION 1.22 diff --git a/lib/Makefile.in b/lib/Makefile.in index 41352ce..0c6adb2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -33,7 +33,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# Copyright (C) 2002-2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2009 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU # General Public License. As a special exception to the GNU General @@ -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 --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 +# 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 --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 mkdtemp modechange obstack quote quotearg rpmatch safe-read save-cwd savedir setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtol strtoul timespec unlinkdir unlocked-io utime utimens version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax @@ -69,9 +69,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ waitpid.c subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ @@ -104,50 +105,52 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbscasecmp.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ + $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbscasecmp.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.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/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/multiarch.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/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/size_max.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/wcrtomb.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 \ @@ -207,6 +210,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -255,11 +259,14 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DIRFD = @GNULIB_DIRFD@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ @@ -294,19 +301,25 @@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LINK = @GNULIB_LINK@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ GNULIB_MBSCHR = @GNULIB_MBSCHR@ GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ GNULIB_MBSLEN = @GNULIB_MBSLEN@ GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ @@ -331,6 +344,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANDIR = @GNULIB_SCANDIR@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ @@ -358,16 +372,23 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ 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_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ATOLL = @HAVE_ATOLL@ +HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ @@ -391,7 +412,9 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ @@ -407,17 +430,25 @@ HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHMOD = @HAVE_LCHMOD@ +HAVE_LINK = @HAVE_LINK@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ +HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOWC = @HAVE_MBRTOWC@ +HAVE_MBSINIT = @HAVE_MBSINIT@ +HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_H = @HAVE_RANDOM_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_SCANDIR = @HAVE_SCANDIR@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -449,11 +480,16 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ +HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ +HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ INCLUDE_NEXT = @INCLUDE_NEXT@ +INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -472,8 +508,13 @@ LIBS = @LIBS@ LIBTAR_LIBDEPS = @LIBTAR_LIBDEPS@ LIBTAR_LTLIBDEPS = @LIBTAR_LTLIBDEPS@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_CLOSE = @LIB_CLOSE@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOCALE_FR = @LOCALE_FR@ +LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ +LOCALE_JA = @LOCALE_JA@ +LOCALE_ZH_CN = @LOCALE_ZH_CN@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -515,8 +556,10 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ +REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ @@ -536,6 +579,12 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ +REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +REPLACE_MBSINIT = @REPLACE_MBSINIT@ +REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ @@ -557,10 +606,14 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ +REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ +REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ @@ -660,33 +713,33 @@ noinst_LTLIBRARIES = # "gettextize --intl". #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.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 \ + backupfile.h btowc.c canonicalize-lgpl.c canonicalize.h \ + chdir-long.c chdir-long.h chown.c fchown-stub.c close.c \ + w32sock.h 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 malloc.c malloc.c \ - malloca.h malloca.valgrind mbchar.h memchr.c mempcpy.c \ - memrchr.c memset.c mkdtemp.c mktime.c modechange.c \ + malloca.h malloca.valgrind mbchar.h mbrtowc.c mbsinit.c \ + mempcpy.c memrchr.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 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 \ + regexec.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 \ @@ -699,9 +752,9 @@ EXTRA_DIST = alloca.c alloca.in.h argmatch.c argmatch.h backupfile.c \ unlinkdir.c unlinkdir.h unlocked-io.h unsetenv.c utime.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 \ - write.c xalloc.h xmalloc.c xgetcwd.c xgetcwd.h xstrtol-error.c \ - xstrtol.c xstrtol.h xstrtoul.c + vasnprintf.h vsnprintf.c wchar.in.h wcrtomb.c wctype.in.h \ + wcwidth.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) $(ERRNO_H) \ $(FCNTL_H) $(FLOAT_H) $(FNMATCH_H) getdate.c $(GETOPT_H) \ $(INTTYPES_H) $(STDARG_H) $(STDBOOL_H) $(STDINT_H) stdio.h \ @@ -729,15 +782,15 @@ libtar_a_SOURCES = argp.h argp-ba.c argp-eexst.c argp-fmtstream.c \ argp-parse.c argp-pin.c argp-pv.c argp-pvh.c argp-xinl.c \ 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 + mbscasecmp.c mbuiter.h openat-die.c size_max.h 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 \ +EXTRA_libtar_a_SOURCES = alloca.c argmatch.c backupfile.c btowc.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 \ @@ -746,11 +799,11 @@ EXTRA_libtar_a_SOURCES = alloca.c argmatch.c backupfile.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 \ + malloc.c malloc.c mbrtowc.c mbsinit.c mempcpy.c memrchr.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 \ + regcomp.c regex.c regex_internal.c regexec.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 \ @@ -758,7 +811,7 @@ EXTRA_libtar_a_SOURCES = alloca.c argmatch.c backupfile.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 \ + vsnprintf.c wcrtomb.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 @@ -847,6 +900,7 @@ 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)/btowc.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@ @@ -896,11 +950,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbchar.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbscasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mempcpy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memset.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdirat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdtemp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ @@ -928,7 +982,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rmdir.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpmatch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtapelib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Po@am__quote@ @@ -968,6 +1021,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc-fsf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version-etc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.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@ @@ -1356,7 +1410,11 @@ dirent.h: dirent.in.h -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|@''GNULIB_SCANDIR''@|$(GNULIB_SCANDIR)|g' \ + -e 's|@''GNULIB_ALPHASORT''@|$(GNULIB_ALPHASORT)|g' \ -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ + -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ + -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/dirent.in.h; \ @@ -1433,6 +1491,7 @@ inttypes.h: inttypes.in.h -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/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ @@ -1462,13 +1521,27 @@ inttypes.h: inttypes.in.h all-local: charset.alias ref-add.sed ref-del.sed install-exec-local: all-local - test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) + if test $(GLIBC21) = no; then \ + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ + darwin* | cygwin* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ + esac ; \ + else \ + need_charset_alias=false ; \ + fi ; \ + if $$need_charset_alias; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ + fi ; \ if test -f $(charset_alias); then \ sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ else \ - if test $(GLIBC21) = no; then \ + if $$need_charset_alias; then \ sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ @@ -1532,6 +1605,7 @@ stdint.h: stdint.in.h -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ @@ -1569,6 +1643,8 @@ stdio.h: stdio.in.h -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \ -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \ -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \ + -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|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' \ @@ -1601,6 +1677,10 @@ stdio.h: stdio.in.h -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ + -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ + -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ + -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|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' \ @@ -1630,6 +1710,7 @@ stdlib.h: stdlib.in.h 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|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_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' \ @@ -1846,6 +1927,7 @@ unistd.h: unistd.in.h -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ + -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ @@ -1860,6 +1942,7 @@ unistd.h: unistd.in.h -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ + -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ @@ -1888,10 +1971,40 @@ wchar.h: wchar.in.h 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|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \ + -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \ + -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \ + -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \ + -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \ + -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \ + -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \ + -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \ + -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \ + -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ - -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ + -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ + -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ + -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \ + -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \ + -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \ + -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ + -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ + -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ + -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ + -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ + -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ + -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ + -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ + -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ + -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \ + -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \ + -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \ + -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/wchar.in.h; \ diff --git a/lib/btowc.c b/lib/btowc.c new file mode 100644 index 0000000..7f3b966 --- /dev/null +++ b/lib/btowc.c @@ -0,0 +1,38 @@ +/* Convert unibyte character to wide character. + 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 + +#include + +wint_t +btowc (int c) +{ + if (c != EOF) + { + char buf[1]; + wchar_t wc; + + buf[0] = c; + if (mbtowc (&wc, buf, 1) >= 0) + return wc; + } + return WEOF; +} diff --git a/lib/config.charset b/lib/config.charset index c233788..7f91212 100755 --- a/lib/config.charset +++ b/lib/config.charset @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2004, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2009 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -63,12 +63,13 @@ # CP922 aix # CP932 aix woe32 dos # CP943 aix -# CP949 osf woe32 dos +# CP949 osf darwin woe32 dos # CP950 woe32 dos # CP1046 aix # CP1124 aix # CP1125 dos # CP1129 aix +# CP1131 darwin # CP1250 woe32 # CP1251 glibc solaris netbsd openbsd darwin woe32 # CP1252 aix woe32 @@ -82,15 +83,17 @@ # EUC-KR Y glibc aix hpux irix osf solaris freebsd netbsd darwin # EUC-TW glibc aix hpux irix osf solaris netbsd # BIG5 Y glibc aix hpux osf solaris freebsd netbsd darwin -# BIG5-HKSCS glibc solaris -# GBK glibc aix osf solaris woe32 dos -# GB18030 glibc solaris netbsd +# BIG5-HKSCS glibc solaris darwin +# GBK glibc aix osf solaris darwin woe32 dos +# GB18030 glibc solaris netbsd darwin # SHIFT_JIS Y hpux osf solaris freebsd netbsd darwin # JOHAB glibc solaris woe32 # TIS-620 glibc aix hpux osf solaris # VISCII Y glibc # TCVN5712-1 glibc +# ARMSCII-8 glibc darwin # GEORGIAN-PS glibc +# PT154 glibc # HP-ROMAN8 hpux # HP-ARABIC8 hpux # HP-GREEK8 hpux @@ -449,7 +452,8 @@ case "$os" in echo "ko_KR.EUC EUC-KR" ;; darwin*) - # Darwin 7.5 has nl_langinfo(CODESET), but it is useless: + # Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is + # useless: # - It returns the empty string when LANG is set to a locale of the # form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8 # LC_CTYPE file. @@ -476,10 +480,40 @@ case "$os" in # minimize the use of decomposed Unicode. Unfortunately, through the # Darwin file system, decomposed UTF-8 strings are leaked into user # space nevertheless. + # Then there are also the locales with encodings other than US-ASCII + # and UTF-8. These locales can be occasionally useful to users (e.g. + # when grepping through ISO-8859-1 encoded text files), when all their + # file names are in US-ASCII. + echo "ISO8859-1 ISO-8859-1" + echo "ISO8859-2 ISO-8859-2" + echo "ISO8859-4 ISO-8859-4" + echo "ISO8859-5 ISO-8859-5" + echo "ISO8859-7 ISO-8859-7" + echo "ISO8859-9 ISO-8859-9" + echo "ISO8859-13 ISO-8859-13" + echo "ISO8859-15 ISO-8859-15" + echo "KOI8-R KOI8-R" + echo "KOI8-U KOI8-U" + echo "CP866 CP866" + echo "CP949 CP949" + echo "CP1131 CP1131" + echo "CP1251 CP1251" + echo "eucCN GB2312" + echo "GB2312 GB2312" + echo "eucJP EUC-JP" + echo "eucKR EUC-KR" + echo "Big5 BIG5" + echo "Big5HKSCS BIG5-HKSCS" + echo "GBK GBK" + echo "GB18030 GB18030" + echo "SJIS SHIFT_JIS" + echo "ARMSCII-8 ARMSCII-8" + echo "PT154 PT154" + #echo "ISCII-DEV ?" echo "* UTF-8" ;; - beos*) - # BeOS has a single locale, and it has UTF-8 encoding. + beos* | haiku*) + # BeOS and Haiku have a single locale, and it has UTF-8 encoding. echo "* UTF-8" ;; msdosdjgpp*) diff --git a/lib/dirent.in.h b/lib/dirent.in.h index 2b1d0a5..15f0245 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -1,5 +1,5 @@ /* A GNU-like . - Copyright (C) 2006-2008 Free Software Foundation, Inc. + Copyright (C) 2006-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ extern DIR * opendir (const char *); extern int closedir (DIR *); #endif -/* Declare GNU extensions. */ +/* Declare other POSIX functions. */ #if @GNULIB_DIRFD@ # if !@HAVE_DECL_DIRFD@ && !defined dirfd @@ -58,6 +58,37 @@ extern int dirfd (DIR const *dir); dirfd (d)) #endif +#if @GNULIB_SCANDIR@ +/* Scan the directory DIR, calling FILTER on each directory entry. + Entries for which FILTER returns nonzero are individually malloc'd, + sorted using qsort with CMP, and collected in a malloc'd array in + *NAMELIST. Returns the number of entries selected, or -1 on error. */ +# if !@HAVE_SCANDIR@ +extern int scandir (const char *dir, struct dirent ***namelist, + int (*filter) (const struct dirent *), + int (*cmp) (const struct dirent **, const struct dirent **)); +# endif +#elif defined GNULIB_POSIXCHECK +# undef scandir +# define scandir(d,n,f,c) \ + (GL_LINK_WARNING ("scandir is unportable - " \ + "use gnulib module scandir for portability"), \ + scandir (d, n, f, c)) +#endif + +#if @GNULIB_ALPHASORT@ +/* Compare two 'struct dirent' entries alphabetically. */ +# if !@HAVE_ALPHASORT@ +extern int alphasort (const struct dirent **, const struct dirent **); +# endif +#elif defined GNULIB_POSIXCHECK +# undef alphasort +# define alphasort(a,b) \ + (GL_LINK_WARNING ("alphasort is unportable - " \ + "use gnulib module alphasort for portability"), \ + alphasort (a, b)) +#endif + #ifdef __cplusplus } #endif diff --git a/lib/dirfd.c b/lib/dirfd.c index 3458e99..81993c5 100644 --- a/lib/dirfd.c +++ b/lib/dirfd.c @@ -1,6 +1,6 @@ /* dirfd.c -- return the file descriptor associated with an open DIR* - Copyright (C) 2001, 2006, 2008 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,9 +20,13 @@ #include #include +#include int dirfd (DIR const *dir_p) { - return DIR_TO_FD (dir_p); + int fd = DIR_TO_FD (dir_p); + if (fd == -1) + errno = ENOTSUP; + return fd; } diff --git a/lib/dup-safer.c b/lib/dup-safer.c index a690851..7d9b2be 100644 --- a/lib/dup-safer.c +++ b/lib/dup-safer.c @@ -1,6 +1,7 @@ /* Invoke dup, but avoid some glitches. - Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2001, 2004, 2005, 2006, 2009 Free Software + Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,9 +25,6 @@ #include #include -#ifndef STDERR_FILENO -# define STDERR_FILENO 2 -#endif /* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or STDERR_FILENO. */ diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index af86c83..fd7520e 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -127,8 +127,8 @@ extern void _gl_register_fd (int fd, const char *filename); # define O_TEXT _O_TEXT #endif -#ifdef __BEOS__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ +#if defined __BEOS__ || defined __HAIKU__ + /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ # undef O_BINARY # undef O_TEXT #endif diff --git a/lib/fd-safer.c b/lib/fd-safer.c index df38c8f..fb99001 100644 --- a/lib/fd-safer.c +++ b/lib/fd-safer.c @@ -1,6 +1,6 @@ /* Return a safer copy of a file descriptor. - Copyright (C) 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,12 +24,6 @@ #include #include -#ifndef STDIN_FILENO -# define STDIN_FILENO 0 -#endif -#ifndef STDERR_FILENO -# define STDERR_FILENO 2 -#endif /* Return FD, unless FD would be a copy of standard input, output, or error; in that case, return a duplicate of FD, closing FD. On diff --git a/lib/fseeko.c b/lib/fseeko.c index 4d6b071..1e34a5d 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An fseeko() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007-2008 Free Software Foundation, Inc. + Copyright (C) 2007-2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) #endif /* These tests are based on fpurge.c. */ -#if defined _IO_ferror_unlocked || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Linux libc5 */ +#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ if (fp->_IO_read_end == fp->_IO_read_ptr && fp->_IO_write_ptr == fp->_IO_write_base && fp->_IO_save_base == NULL) @@ -88,7 +88,14 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib." #endif { - off_t pos = lseek (fileno (fp), offset, whence); + /* We get here when an fflush() call immediately preceded this one. We + know there are no buffers. + POSIX requires us to modify the file descriptor's position. + But we cannot position beyond end of file here. */ + off_t pos = + lseek (fileno (fp), + whence == SEEK_END && offset > 0 ? 0 : offset, + whence); if (pos == -1) { #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ @@ -96,20 +103,22 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) #endif return -1; } - else - { -#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ - fp_->_offset = pos; - fp_->_flags |= __SOFF; - fp_->_flags &= ~__SEOF; + +#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags &= ~_IO_EOF_SEEN; +#elif 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; + fp->_flags &= ~_IOEOF; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ - fp->_flag &= ~_IOEOF; + fp->_flag &= ~_IOEOF; #endif - return 0; - } + /* If we were not requested to position beyond end of file, we're + done. */ + if (!(whence == SEEK_END && offset > 0)) + return 0; } - else - return fseeko (fp, offset, whence); + return fseeko (fp, offset, whence); } diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index b8ec4fa..1d977b1 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -43,6 +43,12 @@ static struct tm tm_zero_buffer; static struct tm *localtime_buffer_addr = &tm_zero_buffer; +#undef localtime +extern struct tm *localtime (time_t const *); + +#undef gmtime +extern struct tm *gmtime (time_t const *); + /* This is a wrapper for localtime. It is used only on systems for which gettimeofday clobbers the static buffer used for localtime's result. @@ -52,8 +58,6 @@ static struct tm *localtime_buffer_addr = &tm_zero_buffer; struct tm * rpl_localtime (time_t const *timep) { -#undef localtime - extern struct tm *localtime (time_t const *); struct tm *tm = localtime (timep); if (localtime_buffer_addr == &tm_zero_buffer) @@ -66,8 +70,6 @@ rpl_localtime (time_t const *timep) struct tm * rpl_gmtime (time_t const *timep) { -#undef gmtime - extern struct tm *gmtime (time_t const *); struct tm *tm = gmtime (timep); if (localtime_buffer_addr == &tm_zero_buffer) @@ -79,14 +81,15 @@ rpl_gmtime (time_t const *timep) #endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */ #if TZSET_CLOBBERS_LOCALTIME + +#undef tzset +extern void tzset (void); + /* This is a wrapper for tzset, for systems on which tzset may clobber the static buffer used for localtime's result. */ void rpl_tzset (void) { -#undef tzset - extern void tzset (void); - /* Save and restore the contents of the buffer used for localtime's result around the call to tzset. */ struct tm save = *localtime_buffer_addr; diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 5792021..7f94093 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2009 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU # General Public License. As a special exception to the GNU General @@ -9,7 +9,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 --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 +# 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 --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 mkdtemp modechange obstack quote quotearg rpmatch safe-read save-cwd savedir setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtol strtoul timespec unlinkdir unlocked-io utime utimens version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects @@ -90,6 +90,15 @@ EXTRA_libtar_a_SOURCES += backupfile.c ## end gnulib module backupfile +## begin gnulib module btowc + + +EXTRA_DIST += btowc.c + +EXTRA_libtar_a_SOURCES += btowc.c + +## end gnulib module btowc + ## begin gnulib module c-ctype libtar_a_SOURCES += c-ctype.h c-ctype.c @@ -126,7 +135,7 @@ EXTRA_libtar_a_SOURCES += chown.c fchown-stub.c ## begin gnulib module close -EXTRA_DIST += close.c +EXTRA_DIST += close.c w32sock.h EXTRA_libtar_a_SOURCES += close.c @@ -219,7 +228,11 @@ dirent.h: dirent.in.h -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|@''GNULIB_SCANDIR''@|$(GNULIB_SCANDIR)|g' \ + -e 's|@''GNULIB_ALPHASORT''@|$(GNULIB_ALPHASORT)|g' \ -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ + -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ + -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/dirent.in.h; \ @@ -605,6 +618,7 @@ inttypes.h: inttypes.in.h -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/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ @@ -663,13 +677,27 @@ all-local: charset.alias ref-add.sed ref-del.sed charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp install-exec-local: all-local - test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) + if test $(GLIBC21) = no; then \ + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ + darwin* | cygwin* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ + esac ; \ + else \ + need_charset_alias=false ; \ + fi ; \ + if $$need_charset_alias; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ + fi ; \ if test -f $(charset_alias); then \ sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ else \ - if test $(GLIBC21) = no; then \ + if $$need_charset_alias; then \ sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ @@ -757,26 +785,35 @@ EXTRA_DIST += mbchar.h ## end gnulib module mbchar +## begin gnulib module mbrtowc + + +EXTRA_DIST += mbrtowc.c + +EXTRA_libtar_a_SOURCES += mbrtowc.c + +## end gnulib module mbrtowc + ## begin gnulib module mbscasecmp libtar_a_SOURCES += mbscasecmp.c ## end gnulib module mbscasecmp -## begin gnulib module mbuiter +## begin gnulib module mbsinit -libtar_a_SOURCES += mbuiter.h -## end gnulib module mbuiter +EXTRA_DIST += mbsinit.c -## begin gnulib module memchr +EXTRA_libtar_a_SOURCES += mbsinit.c +## end gnulib module mbsinit -EXTRA_DIST += memchr.c +## begin gnulib module mbuiter -EXTRA_libtar_a_SOURCES += memchr.c +libtar_a_SOURCES += mbuiter.h -## end gnulib module memchr +## end gnulib module mbuiter ## begin gnulib module mempcpy @@ -796,15 +833,6 @@ EXTRA_libtar_a_SOURCES += memrchr.c ## end gnulib module memrchr -## begin gnulib module memset - - -EXTRA_DIST += memset.c - -EXTRA_libtar_a_SOURCES += memset.c - -## end gnulib module memset - ## begin gnulib module mkdtemp @@ -926,15 +954,6 @@ EXTRA_libtar_a_SOURCES += regcomp.c regex.c regex_internal.c regexec.c ## end gnulib module regex -## begin gnulib module rmdir - - -EXTRA_DIST += rmdir.c - -EXTRA_libtar_a_SOURCES += rmdir.c - -## end gnulib module rmdir - ## begin gnulib module rpmatch @@ -996,6 +1015,12 @@ EXTRA_libtar_a_SOURCES += setenv.c ## end gnulib module setenv +## begin gnulib module size_max + +libtar_a_SOURCES += size_max.h + +## end gnulib module size_max + ## begin gnulib module sleep @@ -1086,6 +1111,7 @@ stdint.h: stdint.in.h -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ + -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ @@ -1132,6 +1158,8 @@ stdio.h: stdio.in.h -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \ -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \ -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \ + -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \ + -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|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' \ @@ -1164,6 +1192,10 @@ stdio.h: stdio.in.h -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ + -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ + -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ + -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ + -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|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' \ @@ -1204,6 +1236,7 @@ stdlib.h: stdlib.in.h 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|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_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' \ @@ -1277,14 +1310,14 @@ EXTRA_libtar_a_SOURCES += strchrnul.c ## end gnulib module strchrnul -## begin gnulib module strdup +## begin gnulib module strdup-posix EXTRA_DIST += strdup.c EXTRA_libtar_a_SOURCES += strdup.c -## end gnulib module strdup +## end gnulib module strdup-posix ## begin gnulib module streq @@ -1639,6 +1672,7 @@ unistd.h: unistd.in.h -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \ -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \ -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \ + -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \ -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \ -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \ -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \ @@ -1653,6 +1687,7 @@ unistd.h: unistd.in.h -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \ + -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ @@ -1800,10 +1835,40 @@ wchar.h: wchar.in.h 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|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \ + -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \ + -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \ + -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \ + -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \ + -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \ + -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \ + -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \ + -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \ + -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \ -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \ - -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ + -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ + -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ + -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \ + -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \ + -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \ + -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \ + -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \ + -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \ + -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \ + -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \ + -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \ -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ + -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \ + -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \ + -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \ + -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \ + -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \ + -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \ + -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \ + -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \ + -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \ + -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/wchar.in.h; \ @@ -1815,6 +1880,15 @@ EXTRA_DIST += wchar.in.h ## end gnulib module wchar +## begin gnulib module wcrtomb + + +EXTRA_DIST += wcrtomb.c + +EXTRA_libtar_a_SOURCES += wcrtomb.c + +## end gnulib module wcrtomb + ## begin gnulib module wctype BUILT_SOURCES += $(WCTYPE_H) diff --git a/lib/inttostr.c b/lib/inttostr.c index 4ba71f5..ed6a693 100644 --- a/lib/inttostr.c +++ b/lib/inttostr.c @@ -1,6 +1,6 @@ /* inttostr.c -- convert integers to printable strings - 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 @@ -17,6 +17,11 @@ /* Written by Paul Eggert */ +/* Tell gcc not to warn about the (i < 0) test, below. */ +#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ +# pragma GCC diagnostic ignored "-Wtype-limits" +#endif + #include #include "inttostr.h" diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index bd9d0d2..33cec2d 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -168,7 +168,7 @@ # endif # endif # ifdef INT64_MAX -# if @INT64_MAX_EQ_LONG_MAX@ +# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _PRI64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _PRI64_PREFIX "I64" @@ -185,7 +185,7 @@ # endif # endif # ifdef UINT64_MAX -# if @UINT64_MAX_EQ_ULONG_MAX@ +# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _PRIu64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _PRIu64_PREFIX "I64" @@ -661,7 +661,7 @@ # endif # endif # ifdef INT64_MAX -# if @INT64_MAX_EQ_LONG_MAX@ +# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @INT64_MAX_EQ_LONG_MAX@) # define _SCN64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _SCN64_PREFIX "I64" @@ -678,7 +678,7 @@ # endif # endif # ifdef UINT64_MAX -# if @UINT64_MAX_EQ_ULONG_MAX@ +# if (@APPLE_UNIVERSAL_BUILD@ ? _LP64 : @UINT64_MAX_EQ_ULONG_MAX@) # define _SCNu64_PREFIX "l" # elif defined _MSC_VER || defined __MINGW32__ # define _SCNu64_PREFIX "I64" diff --git a/lib/localcharset.c b/lib/localcharset.c index f49d75b..b4998ee 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, 2008 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2009 Free Software Foundation, Inc. This 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 @@ #include #include +#if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET +# define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */ +#endif + #if defined _WIN32 || defined __WIN32__ # define WIN32_NATIVE #endif @@ -114,7 +118,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) { -#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) +#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) FILE *fp; const char *dir; const char *base = "charset.alias"; @@ -215,6 +219,39 @@ get_charset_aliases (void) #else +# if defined DARWIN7 + /* To avoid the trouble of installing a file that is shared by many + GNU packages -- many packaging systems have problems with this --, + simply inline the aliases here. */ + cp = "ISO8859-1" "\0" "ISO-8859-1" "\0" + "ISO8859-2" "\0" "ISO-8859-2" "\0" + "ISO8859-4" "\0" "ISO-8859-4" "\0" + "ISO8859-5" "\0" "ISO-8859-5" "\0" + "ISO8859-7" "\0" "ISO-8859-7" "\0" + "ISO8859-9" "\0" "ISO-8859-9" "\0" + "ISO8859-13" "\0" "ISO-8859-13" "\0" + "ISO8859-15" "\0" "ISO-8859-15" "\0" + "KOI8-R" "\0" "KOI8-R" "\0" + "KOI8-U" "\0" "KOI8-U" "\0" + "CP866" "\0" "CP866" "\0" + "CP949" "\0" "CP949" "\0" + "CP1131" "\0" "CP1131" "\0" + "CP1251" "\0" "CP1251" "\0" + "eucCN" "\0" "GB2312" "\0" + "GB2312" "\0" "GB2312" "\0" + "eucJP" "\0" "EUC-JP" "\0" + "eucKR" "\0" "EUC-KR" "\0" + "Big5" "\0" "BIG5" "\0" + "Big5HKSCS" "\0" "BIG5-HKSCS" "\0" + "GBK" "\0" "GBK" "\0" + "GB18030" "\0" "GB18030" "\0" + "SJIS" "\0" "SHIFT_JIS" "\0" + "ARMSCII-8" "\0" "ARMSCII-8" "\0" + "PT154" "\0" "PT154" "\0" + /*"ISCII-DEV" "\0" "?" "\0"*/ + "*" "\0" "UTF-8" "\0"; +# endif + # if defined VMS /* To avoid the troubles of an extra file charset.alias_vms in the sources of many GNU packages, simply inline the aliases here. */ diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c new file mode 100644 index 0000000..ba03973 --- /dev/null +++ b/lib/mbrtowc.c @@ -0,0 +1,386 @@ +/* Convert multibyte character to wide character. + Copyright (C) 1999-2002, 2005-2009 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 + +#if GNULIB_defined_mbstate_t +/* Implement mbrtowc() on top of mbtowc(). */ + +# include +# include + +# include "localcharset.h" +# include "streq.h" +# include "verify.h" + + +verify (sizeof (mbstate_t) >= 4); + +static char internal_state[4]; + +size_t +mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) +{ + char *pstate = (char *)ps; + + if (pstate == NULL) + pstate = internal_state; + + if (s == NULL) + { + pwc = NULL; + s = ""; + n = 1; + } + + if (n == 0) + return (size_t)(-2); + + /* Here n > 0. */ + { + size_t nstate = pstate[0]; + char buf[4]; + const char *p; + size_t m; + + switch (nstate) + { + case 0: + p = s; + m = n; + break; + case 3: + buf[2] = pstate[3]; + /*FALLTHROUGH*/ + case 2: + buf[1] = pstate[2]; + /*FALLTHROUGH*/ + case 1: + buf[0] = pstate[1]; + p = buf; + m = nstate; + buf[m++] = s[0]; + if (n >= 2 && m < 4) + { + buf[m++] = s[1]; + if (n >= 3 && m < 4) + buf[m++] = s[2]; + } + break; + default: + errno = EINVAL; + return (size_t)(-1); + } + + /* Here 0 < m ≤ 4. */ + +# if __GLIBC__ + /* Work around bug */ + mbtowc (NULL, NULL, 0); +# endif + { + int res = mbtowc (pwc, p, m); + + if (res >= 0) + { + if (pwc != NULL && ((*pwc == 0) != (res == 0))) + abort (); + if (nstate >= (res > 0 ? res : 1)) + abort (); + res -= nstate; + pstate[0] = 0; + return res; + } + + /* mbtowc does not distinguish between invalid and incomplete multibyte + sequences. But mbrtowc needs to make this distinction. + There are two possible approaches: + - Use iconv() and its return value. + - Use built-in knowledge about the possible encodings. + Given the low quality of implementation of iconv() on the systems that + lack mbrtowc(), we use the second approach. + The possible encodings are: + - 8-bit encodings, + - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS, + - UTF-8. + Use specialized code for each. */ + if (m >= 4 || m >= MB_CUR_MAX) + goto invalid; + /* Here MB_CUR_MAX > 1 and 0 < m < 4. */ + { + const char *encoding = locale_charset (); + + if (STREQ (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0)) + { + /* Cf. unistr/u8-mblen.c. */ + unsigned char c = (unsigned char) p[0]; + + if (c >= 0xc2) + { + if (c < 0xe0) + { + if (m == 1) + goto incomplete; + } + else if (c < 0xf0) + { + if (m == 1) + goto incomplete; + if (m == 2) + { + unsigned char c2 = (unsigned char) p[1]; + + if ((c2 ^ 0x80) < 0x40 + && (c >= 0xe1 || c2 >= 0xa0) + && (c != 0xed || c2 < 0xa0)) + goto incomplete; + } + } + else if (c <= 0xf4) + { + if (m == 1) + goto incomplete; + else /* m == 2 || m == 3 */ + { + unsigned char c2 = (unsigned char) p[1]; + + if ((c2 ^ 0x80) < 0x40 + && (c >= 0xf1 || c2 >= 0x90) + && (c < 0xf4 || (c == 0xf4 && c2 < 0x90))) + { + if (m == 2) + goto incomplete; + else /* m == 3 */ + { + unsigned char c3 = (unsigned char) p[2]; + + if ((c3 ^ 0x80) < 0x40) + goto incomplete; + } + } + } + } + } + goto invalid; + } + + /* As a reference for this code, you can use the GNU libiconv + implementation. Look for uses of the RET_TOOFEW macro. */ + + if (STREQ (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)) + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0xa1 && c < 0xff) || c == 0x8e || c == 0x8f) + goto incomplete; + } + if (m == 2) + { + unsigned char c = (unsigned char) p[0]; + + if (c == 0x8f) + { + unsigned char c2 = (unsigned char) p[1]; + + if (c2 >= 0xa1 && c2 < 0xff) + goto incomplete; + } + } + goto invalid; + } + if (STREQ (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0) + || STREQ (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0) + || STREQ (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)) + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if (c >= 0xa1 && c < 0xff) + goto incomplete; + } + goto invalid; + } + if (STREQ (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)) + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0xa1 && c < 0xff) || c == 0x8e) + goto incomplete; + } + else /* m == 2 || m == 3 */ + { + unsigned char c = (unsigned char) p[0]; + + if (c == 0x8e) + goto incomplete; + } + goto invalid; + } + if (STREQ (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0)) + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe)) + goto incomplete; + } + else /* m == 2 || m == 3 */ + { + unsigned char c = (unsigned char) p[0]; + + if (c >= 0x90 && c <= 0xe3) + { + unsigned char c2 = (unsigned char) p[1]; + + if (c2 >= 0x30 && c2 <= 0x39) + { + if (m == 2) + goto incomplete; + else /* m == 3 */ + { + unsigned char c3 = (unsigned char) p[2]; + + if (c3 >= 0x81 && c3 <= 0xfe) + goto incomplete; + } + } + } + } + goto invalid; + } + if (STREQ (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0)) + { + if (m == 1) + { + unsigned char c = (unsigned char) p[0]; + + if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea) + || (c >= 0xf0 && c <= 0xf9)) + goto incomplete; + } + goto invalid; + } + + /* An unknown multibyte encoding. */ + goto incomplete; + } + + incomplete: + { + size_t k = nstate; + /* Here 0 <= k < m < 4. */ + pstate[++k] = s[0]; + if (k < m) + { + pstate[++k] = s[1]; + if (k < m) + pstate[++k] = s[2]; + } + if (k != m) + abort (); + } + pstate[0] = m; + return (size_t)(-2); + + invalid: + errno = EILSEQ; + /* The conversion state is undefined, says POSIX. */ + return (size_t)(-1); + } + } +} + +#else +/* Override the system's mbrtowc() function. */ + +# undef mbrtowc + +size_t +rpl_mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) +{ +# if MBRTOWC_NULL_ARG_BUG || MBRTOWC_RETVAL_BUG + if (s == NULL) + { + pwc = NULL; + s = ""; + n = 1; + } +# endif + +# if MBRTOWC_RETVAL_BUG + { + static mbstate_t internal_state; + + /* Override mbrtowc's internal state. We can not call mbsinit() on the + hidden internal state, but we can call it on our variable. */ + if (ps == NULL) + ps = &internal_state; + + if (!mbsinit (ps)) + { + /* Parse the rest of the multibyte character byte for byte. */ + size_t count = 0; + for (; n > 0; s++, n--) + { + wchar_t wc; + size_t ret = mbrtowc (&wc, s, 1, ps); + + if (ret == (size_t)(-1)) + return (size_t)(-1); + count++; + if (ret != (size_t)(-2)) + { + /* The multibyte character has been completed. */ + if (pwc != NULL) + *pwc = wc; + return (wc == 0 ? 0 : count); + } + } + return (size_t)(-2); + } + } +# endif + +# if MBRTOWC_NUL_RETVAL_BUG + { + wchar_t wc; + size_t ret = mbrtowc (&wc, s, n, ps); + + if (ret != (size_t)(-1) && ret != (size_t)(-2)) + { + if (pwc != NULL) + *pwc = wc; + if (wc == 0) + ret = 0; + } + return ret; + } +# else + return mbrtowc (pwc, s, n, ps); +# endif +} + +#endif diff --git a/lib/mbscasecmp.c b/lib/mbscasecmp.c index 19f974b..7fdfdeb 100644 --- a/lib/mbscasecmp.c +++ b/lib/mbscasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2007 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2005, based on earlier glibc code. @@ -24,9 +24,7 @@ #include #include -#if HAVE_MBRTOWC -# include "mbuiter.h" -#endif +#include "mbuiter.h" #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) @@ -44,7 +42,6 @@ mbscasecmp (const char *s1, const char *s2) /* Be careful not to look at the entire extent of s1 or s2 until needed. This is useful because when two strings differ, the difference is most often already in the very few first characters. */ -#if HAVE_MBRTOWC if (MB_CUR_MAX > 1) { mbui_iterator_t iter1; @@ -72,7 +69,6 @@ mbscasecmp (const char *s1, const char *s2) return 0; } else -#endif { const unsigned char *p1 = (const unsigned char *) s1; const unsigned char *p2 = (const unsigned char *) s2; diff --git a/lib/mbsinit.c b/lib/mbsinit.c new file mode 100644 index 0000000..81fed5a --- /dev/null +++ b/lib/mbsinit.c @@ -0,0 +1,47 @@ +/* Test for initial conversion state. + 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 + +#include "verify.h" + +/* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs() + and wcrtomb(), wcsrtombs(). + We assume that + - sizeof (mbstate_t) >= 4, + - only stateless encodings are supported (such as UTF-8 and EUC-JP, but + not ISO-2022 variants), + - for each encoding, the number of bytes for a wide character is <= 4. + (This maximum is attained for UTF-8, GB18030, EUC-TW.) + We define the meaning of mbstate_t as follows: + - In mb -> wc direction, mbstate_t's first byte contains the number of + buffered bytes (in the range 0..3), followed by up to 3 buffered bytes. + - In wc -> mb direction, mbstate_t contains no information. In other + words, it is always in the initial state. */ + +verify (sizeof (mbstate_t) >= 4); + +int +mbsinit (const mbstate_t *ps) +{ + const char *pstate = (const char *)ps; + + return pstate[0] == 0; +} diff --git a/lib/memchr.c b/lib/memchr.c deleted file mode 100644 index 2253d2d..0000000 --- a/lib/memchr.c +++ /dev/null @@ -1,172 +0,0 @@ -/* 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 - commentary by Jim Blandy (jimb@ai.mit.edu); - adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), - and implemented by Roland McGrath (roland@ai.mit.edu). - -NOTE: The canonical source of this file is maintained with the GNU C Library. -Bugs can be reported to bug-glibc@prep.ai.mit.edu. - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3 of the License, or any -later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . */ - -#ifndef _LIBC -# include -#endif - -#include - -#include - -#if defined _LIBC -# include -#else -# define reg_char char -#endif - -#include - -#if HAVE_BP_SYM_H || defined _LIBC -# include -#else -# define BP_SYM(sym) sym -#endif - -#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 longword *longword_ptr; - longword repeated_one; - longword repeated_c; - unsigned reg_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; - 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. */ - - /* 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 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; - - /* 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; - } - - return NULL; -} -#ifdef weak_alias -weak_alias (__memchr, BP_SYM (memchr)) -#endif diff --git a/lib/memset.c b/lib/memset.c deleted file mode 100644 index 25b806f..0000000 --- a/lib/memset.c +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- buffer-read-only: t -*- vi: set ro: */ -/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* memset.c -- set an area of memory to a given value - Copyright (C) 1991, 2003 Free Software Foundation, Inc. - - This program is free software; you can redistribute 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. */ - -#include - -void * -memset (void *str, int c, size_t len) -{ - register char *st = str; - - while (len-- > 0) - *st++ = c; - return str; -} diff --git a/lib/quotearg.c b/lib/quotearg.c index 75fbc72..339bf34 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -37,23 +37,6 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid -#if !HAVE_MBRTOWC -/* Disable multibyte processing entirely. Since MB_CUR_MAX is 1, the - other macros are defined only for documentation and to satisfy C - syntax. */ -# undef MB_CUR_MAX -# define MB_CUR_MAX 1 -# undef mbstate_t -# define mbstate_t int -# define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0) -# define iswprint(wc) isprint ((unsigned char) (wc)) -# undef HAVE_MBSINIT -#endif - -#if !defined mbsinit && !HAVE_MBSINIT -# define mbsinit(ps) 1 -#endif - #ifndef SIZE_MAX # define SIZE_MAX ((size_t) -1) #endif diff --git a/lib/regcomp.c b/lib/regcomp.c index 49a8b48..a4e3f2d 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,7 +1,8 @@ /* -*- 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,2008 Free Software Foundation, Inc. + Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -335,8 +336,8 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, && dfa->nodes[node].mb_partial) *p++ = dfa->nodes[node].opr.c; memset (&state, '\0', sizeof (state)); - if (mbrtowc (&wc, (const char *) buf, p - buf, - &state) == p - buf + if (__mbrtowc (&wc, (const char *) buf, p - buf, + &state) == p - buf && (__wcrtomb ((char *) buf, towlower (wc), &state) != (size_t) -1)) re_set_fastmap (fastmap, false, buf[0]); @@ -358,45 +359,65 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, #ifdef RE_ENABLE_I18N else if (type == COMPLEX_BRACKET) { - Idx i; re_charset_t *cset = dfa->nodes[node].opr.mbcset; - if (cset->non_match || cset->ncoll_syms || cset->nequiv_classes - || cset->nranges || cset->nchar_classes) - { + Idx i; + # ifdef _LIBC - if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0) + /* See if we have to try all bytes which start multiple collation + elements. + e.g. In da_DK, we want to catch 'a' since "aa" is a valid + collation element, and don't catch 'b' since 'b' is + the only collation element which starts from 'b' (and + it is caught by SIMPLE_BRACKET). */ + if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0 + && (cset->ncoll_syms || cset->nranges)) { - /* In this case we want to catch the bytes which are - the first byte of any collation elements. - e.g. In da_DK, we want to catch 'a' since "aa" - is a valid collation element, and don't catch - 'b' since 'b' is the only collation element - which starts from 'b'. */ const int32_t *table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB); for (i = 0; i < SBC_MAX; ++i) if (table[i] < 0) re_set_fastmap (fastmap, icase, i); } -# else - if (dfa->mb_cur_max > 1) - for (i = 0; i < SBC_MAX; ++i) - if (__btowc (i) == WEOF) - re_set_fastmap (fastmap, icase, i); -# endif /* not _LIBC */ +# endif /* _LIBC */ + + /* See if we have to start the match at all multibyte characters, + i.e. where we would not find an invalid sequence. This only + applies to multibyte character sets; for single byte character + sets, the SIMPLE_BRACKET again suffices. */ + if (dfa->mb_cur_max > 1 + && (cset->nchar_classes || cset->non_match +# ifdef _LIBC + || cset->nequiv_classes +# endif /* _LIBC */ + )) + { + unsigned char c = 0; + do + { + mbstate_t mbs; + memset (&mbs, 0, sizeof (mbs)); + if (__mbrtowc (NULL, (char *) &c, 1, &mbs) == (size_t) -2) + re_set_fastmap (fastmap, false, (int) c); + } + while (++c != 0); } - for (i = 0; i < cset->nmbchars; ++i) + + else { - char buf[256]; - mbstate_t state; - memset (&state, '\0', sizeof (state)); - if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1) - re_set_fastmap (fastmap, icase, *(unsigned char *) buf); - if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) + /* ... Else catch all bytes which can start the mbchars. */ + for (i = 0; i < cset->nmbchars; ++i) { - if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) - != (size_t) -1) - re_set_fastmap (fastmap, false, *(unsigned char *) buf); + char buf[256]; + mbstate_t state; + memset (&state, '\0', sizeof (state)); + if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1) + re_set_fastmap (fastmap, icase, *(unsigned char *) buf); + if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) + { + if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) + != (size_t) -1) + re_set_fastmap (fastmap, false, *(unsigned char *) buf); + } } } } diff --git a/lib/regex_internal.c b/lib/regex_internal.c index 598fc74..8a5a286 100644 --- a/lib/regex_internal.c +++ b/lib/regex_internal.c @@ -1,8 +1,8 @@ /* -*- 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, 2009 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -238,7 +238,7 @@ build_wcs_buffer (re_string_t *pstr) } else p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx; - mbclen = mbrtowc (&wc, p, remain_len, &pstr->cur_state); + mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); if (BE (mbclen == (size_t) -2, 0)) { /* The buffer doesn't have enough space, finish to build. */ @@ -308,9 +308,9 @@ build_wcs_upper_buffer (re_string_t *pstr) remain_len = end_idx - byte_idx; prev_st = pstr->cur_state; - mbclen = mbrtowc (&wc, - ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx - + byte_idx), remain_len, &pstr->cur_state); + mbclen = __mbrtowc (&wc, + ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx + + byte_idx), remain_len, &pstr->cur_state); if (BE (mbclen < (size_t) -2, 1)) { wchar_t wcu = wc; @@ -378,7 +378,7 @@ build_wcs_upper_buffer (re_string_t *pstr) } else p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx; - mbclen = mbrtowc (&wc, p, remain_len, &pstr->cur_state); + mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); if (BE (mbclen < (size_t) -2, 1)) { wchar_t wcu = wc; @@ -501,8 +501,8 @@ re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc) Idx remain_len; remain_len = pstr->len - rawbuf_idx; prev_st = pstr->cur_state; - mbclen = mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx, - remain_len, &pstr->cur_state); + mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx, + remain_len, &pstr->cur_state); if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0)) { /* We treat these cases as a single byte character. */ @@ -689,10 +689,10 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) } else { +#ifdef RE_ENABLE_I18N /* No, skip all characters until IDX. */ Idx prev_valid_len = pstr->valid_len; -#ifdef RE_ENABLE_I18N if (BE (pstr->offsets_needed, 0)) { pstr->len = pstr->raw_len - idx + offset; @@ -747,8 +747,8 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags) /* XXX Don't use mbrtowc, we know which conversion to use (UTF-8 -> UCS4). */ memset (&cur_state, 0, sizeof (cur_state)); - mbclen = mbrtowc (&wc2, (const char *) p, mlen, - &cur_state); + mbclen = __mbrtowc (&wc2, (const char *) p, mlen, + &cur_state); if (raw + offset - p <= mbclen && mbclen < (size_t) -2) { diff --git a/lib/regex_internal.h b/lib/regex_internal.h index 131e025..a5070dc 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -1,7 +1,8 @@ /* -*- 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, 2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -86,7 +87,7 @@ # define SIZE_MAX ((size_t) -1) #endif -#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC +#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC # define RE_ENABLE_I18N #endif @@ -117,6 +118,7 @@ # define __iswctype iswctype # define __btowc btowc # define __wcrtomb wcrtomb +# define __mbrtowc mbrtowc # define __regfree regfree # define attribute_hidden #endif /* not _LIBC */ @@ -184,10 +186,6 @@ typedef unsigned long int bitset_word_t; # if BITSET_WORD_BITS <= SBC_MAX # error "Invalid SBC_MAX" # endif -#elif BITSET_WORD_MAX == (0xffffffff + 2) * 0xffffffff -/* Work around a bug in 64-bit PGC (before version 6.1-2), where the - preprocessor mishandles large unsigned values as if they were signed. */ -# define BITSET_WORD_BITS 64 #else # error "Add case for new bitset_word_t size" #endif diff --git a/lib/regexec.c b/lib/regexec.c index a0942cc..4853551 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,8 +1,8 @@ /* -*- 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, 2008 Free Software Foundation, - Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -1047,6 +1047,11 @@ prune_impossible_nodes (re_match_context_t *mctx) re_node_set_free (&sctx.limits); if (BE (ret != REG_NOERROR, 0)) goto free_return; + if (sifted_states[0] == NULL) + { + ret = REG_NOMATCH; + goto free_return; + } } re_free (mctx->state_log); mctx->state_log = sifted_states; @@ -3081,7 +3086,9 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx, const re_dfa_t *const dfa = mctx->dfa; bool ok; Idx cur_idx; +#ifdef RE_ENABLE_I18N reg_errcode_t err = REG_NOERROR; +#endif re_node_set union_set; re_node_set_init_empty (&union_set); for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx) diff --git a/lib/rmdir.c b/lib/rmdir.c deleted file mode 100644 index 113d13c..0000000 --- a/lib/rmdir.c +++ /dev/null @@ -1,73 +0,0 @@ -/* BSD compatible remove directory function for System V - - Copyright (C) 1988, 1990, 1999, 2003, 2004, 2005, 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 . */ - -#include - -#include -#include -#include - -/* rmdir adapted from GNU tar. */ - -/* Remove directory DIR. - Return 0 if successful, -1 if not. */ - -int -rmdir (char const *dir) -{ - pid_t cpid; - int status; - struct stat statbuf; - - if (stat (dir, &statbuf) != 0) - return -1; /* errno already set */ - - if (!S_ISDIR (statbuf.st_mode)) - { - errno = ENOTDIR; - return -1; - } - - cpid = fork (); - switch (cpid) - { - case -1: /* cannot fork */ - return -1; /* errno already set */ - - case 0: /* child process */ - execl ("/bin/rmdir", "rmdir", dir, (char *) 0); - _exit (1); - - default: /* parent process */ - - /* Wait for kid to finish. */ - - while (wait (&status) != cpid) - /* Do nothing. */ ; - - if (status) - { - - /* /bin/rmdir failed. */ - - errno = EIO; - return -1; - } - return 0; - } -} diff --git a/lib/size_max.h b/lib/size_max.h new file mode 100644 index 0000000..09e6071 --- /dev/null +++ b/lib/size_max.h @@ -0,0 +1,33 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* size_max.h -- declare SIZE_MAX through system headers + Copyright (C) 2005-2006 Free Software Foundation, Inc. + Written by Simon Josefsson. + + This program is free software; you can redistribute 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 GNULIB_SIZE_MAX_H +#define GNULIB_SIZE_MAX_H + +/* Get SIZE_MAX declaration on systems like Solaris 7/8/9. */ +# include +/* Get SIZE_MAX declaration on systems like glibc 2. */ +# if HAVE_STDINT_H +# include +# endif +/* On systems where these include files don't define it, SIZE_MAX is defined + in config.h. */ + +#endif /* GNULIB_SIZE_MAX_H */ diff --git a/lib/stdint.in.h b/lib/stdint.in.h index 55fe176..74d4d3c 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-2008 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2009 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -91,15 +91,6 @@ # include #endif -#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS - -/* Get WCHAR_MIN, WCHAR_MAX. */ -# if ! (defined WCHAR_MIN && defined WCHAR_MAX) -# include -# endif - -#endif - #undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H /* Minimum and maximum values for a integer type under the usual assumption. @@ -124,46 +115,58 @@ #undef int8_t #undef uint8_t -#define int8_t signed char -#define uint8_t unsigned char +typedef signed char gl_int8_t; +typedef unsigned char gl_uint8_t; +#define int8_t gl_int8_t +#define uint8_t gl_uint8_t #undef int16_t #undef uint16_t -#define int16_t short int -#define uint16_t unsigned short int +typedef short int gl_int16_t; +typedef unsigned short int gl_uint16_t; +#define int16_t gl_int16_t +#define uint16_t gl_uint16_t #undef int32_t #undef uint32_t -#define int32_t int -#define uint32_t unsigned int +typedef int gl_int32_t; +typedef unsigned int gl_uint32_t; +#define int32_t gl_int32_t +#define uint32_t gl_uint32_t /* Do not undefine int64_t if gnulib is not being used with 64-bit types, since otherwise it breaks platforms like Tandem/NSK. */ #if LONG_MAX >> 31 >> 31 == 1 # undef int64_t -# define int64_t long int +typedef long int gl_int64_t; +# define int64_t gl_int64_t # define GL_INT64_T #elif defined _MSC_VER # undef int64_t -# define int64_t __int64 +typedef __int64 gl_int64_t; +# define int64_t gl_int64_t # define GL_INT64_T #elif @HAVE_LONG_LONG_INT@ # undef int64_t -# define int64_t long long int +typedef long long int gl_int64_t; +# define int64_t gl_int64_t # define GL_INT64_T #endif #if ULONG_MAX >> 31 >> 31 >> 1 == 1 # undef uint64_t -# define uint64_t unsigned long int +typedef unsigned long int gl_uint64_t; +# define uint64_t gl_uint64_t # define GL_UINT64_T #elif defined _MSC_VER # undef uint64_t -# define uint64_t unsigned __int64 +typedef unsigned __int64 gl_uint64_t; +# define uint64_t gl_uint64_t # define GL_UINT64_T #elif @HAVE_UNSIGNED_LONG_LONG_INT@ # undef uint64_t -# define uint64_t unsigned long long int +typedef unsigned long long int gl_uint64_t; +# define uint64_t gl_uint64_t # define GL_UINT64_T #endif @@ -218,12 +221,18 @@ #undef uint_fast32_t #undef int_fast64_t #undef uint_fast64_t -#define int_fast8_t long int -#define uint_fast8_t unsigned int_fast8_t -#define int_fast16_t long int -#define uint_fast16_t unsigned int_fast16_t -#define int_fast32_t long int -#define uint_fast32_t unsigned int_fast32_t +typedef long int gl_int_fast8_t; +typedef unsigned long int gl_uint_fast8_t; +typedef long int gl_int_fast16_t; +typedef unsigned long int gl_uint_fast16_t; +typedef long int gl_int_fast32_t; +typedef unsigned long int gl_uint_fast32_t; +#define int_fast8_t gl_int_fast8_t +#define uint_fast8_t gl_uint_fast8_t +#define int_fast16_t gl_int_fast16_t +#define uint_fast16_t gl_uint_fast16_t +#define int_fast32_t gl_int_fast32_t +#define uint_fast32_t gl_uint_fast32_t #ifdef GL_INT64_T # define int_fast64_t int64_t #endif @@ -235,8 +244,10 @@ #undef intptr_t #undef uintptr_t -#define intptr_t long int -#define uintptr_t unsigned long int +typedef long int gl_intptr_t; +typedef unsigned long int gl_uintptr_t; +#define intptr_t gl_intptr_t +#define uintptr_t gl_uintptr_t /* 7.18.1.5. Greatest-width integer types */ @@ -245,20 +256,24 @@ #undef intmax_t #if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 -# define intmax_t long long int +typedef long long int gl_intmax_t; +# define intmax_t gl_intmax_t #elif defined GL_INT64_T # define intmax_t int64_t #else -# define intmax_t long int +typedef long int gl_intmax_t; +# define intmax_t gl_intmax_t #endif #undef uintmax_t #if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 -# define uintmax_t unsigned long long int +typedef unsigned long long int gl_uintmax_t; +# define uintmax_t gl_uintmax_t #elif defined GL_UINT64_T # define uintmax_t uint64_t #else -# define uintmax_t unsigned long int +typedef unsigned long int gl_uintmax_t; +# define uintmax_t gl_uintmax_t #endif /* Verify that intmax_t and uintmax_t have the same size. Too much code @@ -421,10 +436,20 @@ typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - /* ptrdiff_t limits */ #undef PTRDIFF_MIN #undef PTRDIFF_MAX -#define PTRDIFF_MIN \ - _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) -#define PTRDIFF_MAX \ - _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +#if @APPLE_UNIVERSAL_BUILD@ +# if _LP64 +# define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) +# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) +# else +# define PTRDIFF_MIN _STDINT_MIN (1, 32, 0) +# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) +# endif +#else +# define PTRDIFF_MIN \ + _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +# define PTRDIFF_MAX \ + _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +#endif /* sig_atomic_t limits */ #undef SIG_ATOMIC_MIN @@ -439,9 +464,26 @@ typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - /* size_t limit */ #undef SIZE_MAX -#define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) +#if @APPLE_UNIVERSAL_BUILD@ +# if _LP64 +# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) +# else +# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) +# endif +#else +# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) +#endif /* wchar_t limits */ +/* Get WCHAR_MIN, WCHAR_MAX. + This include is not on the top, above, because on OSF/1 4.0 we have a sequence of nested + includes -> -> -> , and the latter includes + and assumes its types are already defined. */ +#if ! (defined WCHAR_MIN && defined WCHAR_MAX) +# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +# include +# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +#endif #undef WCHAR_MIN #undef WCHAR_MAX #define WCHAR_MIN \ diff --git a/lib/stdio.in.h b/lib/stdio.in.h index c237604..863b903 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -218,6 +218,38 @@ extern int vsprintf (char *str, const char *format, va_list args) vsprintf (b, f, a)) #endif +#if @GNULIB_DPRINTF@ +# if @REPLACE_DPRINTF@ +# define dprintf rpl_dprintf +# endif +# if @REPLACE_DPRINTF@ || !@HAVE_DPRINTF@ +extern int dprintf (int fd, const char *format, ...) + __attribute__ ((__format__ (__printf__, 2, 3))); +# endif +#elif defined GNULIB_POSIXCHECK +# undef dprintf +# define dprintf(d,f,a) \ + (GL_LINK_WARNING ("dprintf is unportable - " \ + "use gnulib module dprintf for portability"), \ + dprintf (d, f, a)) +#endif + +#if @GNULIB_VDPRINTF@ +# if @REPLACE_VDPRINTF@ +# define vdprintf rpl_vdprintf +# endif +# if @REPLACE_VDPRINTF@ || !@HAVE_VDPRINTF@ +extern int vdprintf (int fd, const char *format, va_list args) + __attribute__ ((__format__ (__printf__, 2, 0))); +# endif +#elif defined GNULIB_POSIXCHECK +# undef vdprintf +# define vdprintf(d,f,a) \ + (GL_LINK_WARNING ("vdprintf is unportable - " \ + "use gnulib module vdprintf for portability"), \ + vdprintf (d, f, a)) +#endif + #if @GNULIB_VASPRINTF@ # if @REPLACE_VASPRINTF@ # define asprintf rpl_asprintf diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index f6ebe25..f99767f 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2008 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,6 +41,12 @@ # include #endif +/* OSF/1 5.1 declares 'struct random_data' in , which is included + from if _REENTRANT is defined. Include it always. */ +#if @HAVE_RANDOM_H@ +# include +#endif + #if @GNULIB_RANDOM_R@ || !@HAVE_STRUCT_RANDOM_DATA@ # include #endif @@ -52,8 +58,8 @@ struct random_data 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. */ + 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 diff --git a/lib/strerror.c b/lib/strerror.c index 787575f..798d854 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2008 Free Software Foundation, Inc. + Copyright (C) 2007-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,94 +40,133 @@ char * rpl_strerror (int n) { + char const *msg = NULL; /* These error messages are taken from glibc/sysdeps/gnu/errlist.c. */ switch (n) { # if GNULIB_defined_ETXTBSY case ETXTBSY: - return "Text file busy"; + msg = "Text file busy"; + break; # endif # if GNULIB_defined_ESOCK /* native Windows platforms */ /* EWOULDBLOCK is the same as EAGAIN. */ case EINPROGRESS: - return "Operation now in progress"; + msg = "Operation now in progress"; + break; case EALREADY: - return "Operation already in progress"; + msg = "Operation already in progress"; + break; case ENOTSOCK: - return "Socket operation on non-socket"; + msg = "Socket operation on non-socket"; + break; case EDESTADDRREQ: - return "Destination address required"; + msg = "Destination address required"; + break; case EMSGSIZE: - return "Message too long"; + msg = "Message too long"; + break; case EPROTOTYPE: - return "Protocol wrong type for socket"; + msg = "Protocol wrong type for socket"; + break; case ENOPROTOOPT: - return "Protocol not available"; + msg = "Protocol not available"; + break; case EPROTONOSUPPORT: - return "Protocol not supported"; + msg = "Protocol not supported"; + break; case ESOCKTNOSUPPORT: - return "Socket type not supported"; + msg = "Socket type not supported"; + break; case EOPNOTSUPP: - return "Operation not supported"; + msg = "Operation not supported"; + break; case EPFNOSUPPORT: - return "Protocol family not supported"; + msg = "Protocol family not supported"; + break; case EAFNOSUPPORT: - return "Address family not supported by protocol"; + msg = "Address family not supported by protocol"; + break; case EADDRINUSE: - return "Address already in use"; + msg = "Address already in use"; + break; case EADDRNOTAVAIL: - return "Cannot assign requested address"; + msg = "Cannot assign requested address"; + break; case ENETDOWN: - return "Network is down"; + msg = "Network is down"; + break; case ENETUNREACH: - return "Network is unreachable"; + msg = "Network is unreachable"; + break; case ENETRESET: - return "Network dropped connection on reset"; + msg = "Network dropped connection on reset"; + break; case ECONNABORTED: - return "Software caused connection abort"; + msg = "Software caused connection abort"; + break; case ECONNRESET: - return "Connection reset by peer"; + msg = "Connection reset by peer"; + break; case ENOBUFS: - return "No buffer space available"; + msg = "No buffer space available"; + break; case EISCONN: - return "Transport endpoint is already connected"; + msg = "Transport endpoint is already connected"; + break; case ENOTCONN: - return "Transport endpoint is not connected"; + msg = "Transport endpoint is not connected"; + break; case ESHUTDOWN: - return "Cannot send after transport endpoint shutdown"; + msg = "Cannot send after transport endpoint shutdown"; + break; case ETOOMANYREFS: - return "Too many references: cannot splice"; + msg = "Too many references: cannot splice"; + break; case ETIMEDOUT: - return "Connection timed out"; + msg = "Connection timed out"; + break; case ECONNREFUSED: - return "Connection refused"; + msg = "Connection refused"; + break; case ELOOP: - return "Too many levels of symbolic links"; + msg = "Too many levels of symbolic links"; + break; case EHOSTDOWN: - return "Host is down"; + msg = "Host is down"; + break; case EHOSTUNREACH: - return "No route to host"; + msg = "No route to host"; + break; case EPROCLIM: - return "Too many processes"; + msg = "Too many processes"; + break; case EUSERS: - return "Too many users"; + msg = "Too many users"; + break; case EDQUOT: - return "Disk quota exceeded"; + msg = "Disk quota exceeded"; + break; case ESTALE: - return "Stale NFS file handle"; + msg = "Stale NFS file handle"; + break; case EREMOTE: - return "Object is remote"; + msg = "Object is remote"; + break; # 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"; + msg = "Overlapped operation aborted"; + break; case WSA_IO_INCOMPLETE: - return "Overlapped I/O event object not in signaled state"; + msg = "Overlapped I/O event object not in signaled state"; + break; case WSA_IO_PENDING: - return "Overlapped operations will complete later"; + msg = "Overlapped operations will complete later"; + break; /* WSAEINTR maps to EINTR */ /* WSAEBADF maps to EBADF */ /* WSAEACCES maps to EACCES */ @@ -172,98 +211,127 @@ rpl_strerror (int n) /* WSAESTALE is ESTALE */ /* WSAEREMOTE is EREMOTE */ case WSASYSNOTREADY: - return "Network subsystem is unavailable"; + msg = "Network subsystem is unavailable"; + break; case WSAVERNOTSUPPORTED: - return "Winsock.dll version out of range"; + msg = "Winsock.dll version out of range"; + break; case WSANOTINITIALISED: - return "Successful WSAStartup not yet performed"; + msg = "Successful WSAStartup not yet performed"; + break; case WSAEDISCON: - return "Graceful shutdown in progress"; + msg = "Graceful shutdown in progress"; + break; case WSAENOMORE: case WSA_E_NO_MORE: - return "No more results"; + msg = "No more results"; + break; case WSAECANCELLED: case WSA_E_CANCELLED: - return "Call was canceled"; + msg = "Call was canceled"; + break; case WSAEINVALIDPROCTABLE: - return "Procedure call table is invalid"; + msg = "Procedure call table is invalid"; + break; case WSAEINVALIDPROVIDER: - return "Service provider is invalid"; + msg = "Service provider is invalid"; + break; case WSAEPROVIDERFAILEDINIT: - return "Service provider failed to initialize"; + msg = "Service provider failed to initialize"; + break; case WSASYSCALLFAILURE: - return "System call failure"; + msg = "System call failure"; + break; case WSASERVICE_NOT_FOUND: - return "Service not found"; + msg = "Service not found"; + break; case WSATYPE_NOT_FOUND: - return "Class type not found"; + msg = "Class type not found"; + break; case WSAEREFUSED: - return "Database query was refused"; + msg = "Database query was refused"; + break; case WSAHOST_NOT_FOUND: - return "Host not found"; + msg = "Host not found"; + break; case WSATRY_AGAIN: - return "Nonauthoritative host not found"; + msg = "Nonauthoritative host not found"; + break; case WSANO_RECOVERY: - return "Nonrecoverable error"; + msg = "Nonrecoverable error"; + break; case WSANO_DATA: - return "Valid name, no data record of requested type"; + msg = "Valid name, no data record of requested type"; + break; /* WSA_QOS_* omitted */ # endif # endif # if GNULIB_defined_ENOMSG case ENOMSG: - return "No message of desired type"; + msg = "No message of desired type"; + break; # endif # if GNULIB_defined_EIDRM case EIDRM: - return "Identifier removed"; + msg = "Identifier removed"; + break; # endif # if GNULIB_defined_ENOLINK case ENOLINK: - return "Link has been severed"; + msg = "Link has been severed"; + break; # endif # if GNULIB_defined_EPROTO case EPROTO: - return "Protocol error"; + msg = "Protocol error"; + break; # endif # if GNULIB_defined_EMULTIHOP case EMULTIHOP: - return "Multihop attempted"; + msg = "Multihop attempted"; + break; # endif # if GNULIB_defined_EBADMSG case EBADMSG: - return "Bad message"; + msg = "Bad message"; + break; # endif # if GNULIB_defined_EOVERFLOW case EOVERFLOW: - return "Value too large for defined data type"; + msg = "Value too large for defined data type"; + break; # endif # if GNULIB_defined_ENOTSUP case ENOTSUP: - return "Not supported"; + msg = "Not supported"; + break; # endif # if GNULIB_defined_ case ECANCELED: - return "Operation canceled"; + msg = "Operation canceled"; + break; # endif } + if (msg) + return (char *) msg; + { 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; + static char msg_buf[sizeof fmt + INT_STRLEN_BOUND (n)]; + sprintf (msg_buf, fmt, n); + return msg_buf; } return result; diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 74a8d51..ff42af7 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) 2005-2008 Free Software Foundation, Inc. + Copyright (C) 2005-2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,6 +37,9 @@ #ifndef _GL_SYS_STAT_H +/* Get nlink_t. */ +#include + /* The include_next requires a split double-inclusion guard. */ #@INCLUDE_NEXT@ @NEXT_SYS_STAT_H@ @@ -277,6 +280,12 @@ # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #endif + +#ifdef __cplusplus +extern "C" { +#endif + + #if @GNULIB_LSTAT@ # if ! @HAVE_LSTAT@ /* mingw does not support symlinks, therefore it does not have lstat. But @@ -343,6 +352,12 @@ extern int lchmod (const char *filename, mode_t mode); lchmod (f, m)) #endif + +#ifdef __cplusplus +} +#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 2a552e1..6db7ba8 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -41,6 +41,10 @@ # include # endif +#ifdef __cplusplus +extern "C" { +#endif + # if ! @HAVE_STRUCT_TIMEVAL@ struct timeval { @@ -55,4 +59,8 @@ struct timeval int gettimeofday (struct timeval *restrict, void *restrict); # endif +#ifdef __cplusplus +} +#endif + #endif /* _GL_SYS_TIME_H */ diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 768d4e6..da1d133 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) 2003-2008 Free Software Foundation, Inc. + Copyright (C) 2003-2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,12 +31,13 @@ #ifndef _GL_UNISTD_H #define _GL_UNISTD_H -/* mingw doesn't define the SEEK_* macros in . */ +/* mingw doesn't define the SEEK_* or *_FILENO macros in . */ #if !(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) # include #endif /* mingw fails to declare _exit in . */ +/* mingw, BeOS, Haiku declare environ in , not in . */ #include #if @GNULIB_WRITE@ && @REPLACE_WRITE@ && @GNULIB_UNISTD_H_SIGPIPE@ @@ -88,6 +89,17 @@ /* The definition of GL_LINK_WARNING is copied here. */ +/* OS/2 EMX lacks these macros. */ +#ifndef STDIN_FILENO +# define STDIN_FILENO 0 +#endif +#ifndef STDOUT_FILENO +# define STDOUT_FILENO 1 +#endif +#ifndef STDERR_FILENO +# define STDERR_FILENO 2 +#endif + /* Declare overridden functions. */ #ifdef __cplusplus @@ -476,6 +488,23 @@ extern int lchown (char const *file, uid_t owner, gid_t group); #endif +#if @GNULIB_LINK@ +/* Create a new hard link for an existing file. + Return 0 if successful, otherwise -1 and errno set. + See POSIX:2001 specification + . */ +# if !@HAVE_LINK@ +extern int link (const char *path1, const char *path2); +# endif +#elif defined GNULIB_POSIXCHECK +# undef link +# define link(path1,path2) \ + (GL_LINK_WARNING ("link is unportable - " \ + "use gnulib module link for portability"), \ + link (path1, path2)) +#endif + + #if @GNULIB_LSEEK@ # if @REPLACE_LSEEK@ /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END. diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c index 29aaf2a..0c29da6 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-2008 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2009 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it @@ -34,7 +34,7 @@ * - Zero width characters; generated from * "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt" */ -static const unsigned char nonspacing_table_data[22*64] = { +static const unsigned char nonspacing_table_data[26*64] = { /* 0x0000-0x01ff */ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */ @@ -56,14 +56,14 @@ static const unsigned char nonspacing_table_data[22*64] = { /* 0x0400-0x05ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0400-0x043f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0440-0x047f */ - 0x78, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0480-0x04bf */ + 0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0480-0x04bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04c0-0x04ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0500-0x053f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0540-0x057f */ 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */ 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */ /* 0x0600-0x07ff */ - 0x0f, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ + 0x0f, 0x00, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */ 0x00, 0xf8, 0xff, 0x7f, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */ 0x00, 0x00, 0xc0, 0xff, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */ @@ -82,20 +82,20 @@ static const unsigned char nonspacing_table_data[22*64] = { 0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x09c0-0x09ff */ /* 0x0a00-0x0bff */ 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a00-0x0a3f */ - 0x86, 0x39, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0x0a40-0x0a7f */ + 0x86, 0x39, 0x02, 0x00, 0x00, 0x00, 0x23, 0x00, /* 0x0a40-0x0a7f */ 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a80-0x0abf */ 0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0ac0-0x0aff */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0x0b00-0x0b3f */ - 0x0e, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */ + 0x1e, 0x20, 0x40, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */ 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */ 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0bc0-0x0bff */ /* 0x0c00-0x0dff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x0c00-0x0c3f */ - 0xc1, 0x3d, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */ + 0xc1, 0x3d, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */ 0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d00-0x0d3f */ - 0x0e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */ + 0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */ 0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */ /* 0x0e00-0x0fff */ @@ -108,9 +108,9 @@ static const unsigned char nonspacing_table_data[22*64] = { 0xdf, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */ 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */ /* 0x1000-0x11ff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc5, 0x02, /* 0x1000-0x103f */ - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, /* 0x1040-0x107f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */ + 0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */ + 0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1140-0x117f */ @@ -139,7 +139,7 @@ static const unsigned char nonspacing_table_data[22*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */ - 0x00, 0x00, 0x00, 0x00, 0x87, 0x0f, 0x04, 0x0e, /* 0x1900-0x193f */ + 0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x04, 0x0e, /* 0x1900-0x193f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1980-0x19bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */ @@ -150,26 +150,35 @@ static const unsigned char nonspacing_table_data[22*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */ 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */ 0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1b80-0x1bbf */ + 0x03, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x00, 0x00, /* 0x1b80-0x1bbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc0-0x1bff */ /* 0x1c00-0x1dff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c00-0x1c3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cc0-0x1cff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */ - 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */ + 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0xc0, /* 0x1dc0-0x1dff */ /* 0x2000-0x21ff */ 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */ - 0x00, 0x00, 0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */ + 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, /* 0x2040-0x207f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2080-0x20bf */ - 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /* 0x20c0-0x20ff */ + 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, /* 0x20c0-0x20ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2100-0x213f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2140-0x217f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2180-0x21bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x21c0-0x21ff */ + /* 0x2c00-0x2dff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2cc0-0x2cff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d40-0x2d7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */ + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */ /* 0x3000-0x31ff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, /* 0x3000-0x303f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3040-0x307f */ @@ -179,15 +188,33 @@ static const unsigned char nonspacing_table_data[22*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3140-0x317f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3180-0x31bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x31c0-0x31ff */ + /* 0xa600-0xa7ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x30, /* 0xa640-0xa67f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa6c0-0xa6ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa7c0-0xa7ff */ /* 0xa800-0xa9ff */ 0x44, 0x08, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0xa800-0xa83f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa900-0xa93f */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */ + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa8c0-0xa8ff */ + 0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */ + 0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa980-0xa9bf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */ + /* 0xaa00-0xabff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */ + 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa40-0xaa7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaa80-0xaabf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xaac0-0xaaff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xabc0-0xabff */ /* 0xfa00-0xfbff */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */ @@ -198,7 +225,7 @@ static const unsigned char nonspacing_table_data[22*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb80-0xfbbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfbc0-0xfbff */ /* 0xfe00-0xffff */ - 0xff, 0xff, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, /* 0xfe00-0xfe3f */ + 0xff, 0xff, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, /* 0xfe00-0xfe3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe40-0xfe7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe80-0xfebf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0xfec0-0xfeff */ @@ -206,6 +233,15 @@ static const unsigned char nonspacing_table_data[22*64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff40-0xff7f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff80-0xffbf */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, /* 0xffc0-0xffff */ + /* 0x10000-0x101ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10000-0x1003f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10040-0x1007f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10080-0x100bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x100c0-0x100ff */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10100-0x1013f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10140-0x1017f */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10180-0x101bf */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, /* 0x101c0-0x101ff */ /* 0x10a00-0x10bff */ 0x6e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, /* 0x10a00-0x10a3f */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a40-0x10a7f */ @@ -237,21 +273,21 @@ static const unsigned char nonspacing_table_data[22*64] = { static const signed char nonspacing_table_ind[240] = { 0, 1, 2, 3, 4, 5, 6, 7, /* 0x0000-0x0fff */ 8, 9, -1, 10, 11, 12, 13, -1, /* 0x1000-0x1fff */ - 14, -1, -1, -1, -1, -1, -1, -1, /* 0x2000-0x2fff */ - 15, -1, -1, -1, -1, -1, -1, -1, /* 0x3000-0x3fff */ + 14, -1, -1, -1, -1, -1, 15, -1, /* 0x2000-0x2fff */ + 16, -1, -1, -1, -1, -1, -1, -1, /* 0x3000-0x3fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x4000-0x4fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x5000-0x5fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x6000-0x6fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x7000-0x7fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x8000-0x8fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x9000-0x9fff */ - -1, -1, -1, -1, 16, -1, -1, -1, /* 0xa000-0xafff */ + -1, -1, -1, 17, 18, 19, -1, -1, /* 0xa000-0xafff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb000-0xbfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc000-0xcfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0xd000-0xdfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */ - -1, -1, -1, -1, -1, 17, -1, 18, /* 0xf000-0xffff */ - -1, -1, -1, -1, -1, 19, -1, -1, /* 0x10000-0x10fff */ + -1, -1, -1, -1, -1, 20, -1, 21, /* 0xf000-0xffff */ + 22, -1, -1, -1, -1, 23, -1, -1, /* 0x10000-0x10fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x11000-0x11fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */ @@ -264,7 +300,7 @@ static const signed char nonspacing_table_ind[240] = { -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1b000-0x1bfff */ -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1c000-0x1cfff */ - 20, 21, -1, -1, -1, -1, -1, -1 /* 0x1d000-0x1dfff */ + 24, 25, -1, -1, -1, -1, -1, -1 /* 0x1d000-0x1dfff */ }; /* Determine number of column positions required for UC. */ diff --git a/lib/version-etc.c b/lib/version-etc.c index 823e085..2258c2e 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -1,5 +1,5 @@ -/* Utility to help print --version output in a consistent format. - Copyright (C) 1999-2008 Free Software Foundation, Inc. +/* Print --version and bug-reporting information in a consistent format. + Copyright (C) 1999-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,7 +32,7 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -enum { COPYRIGHT_YEAR = 2008 }; +enum { COPYRIGHT_YEAR = 2009 }; /* Like version_etc, below, but with the NULL-terminated author list provided via a variable of type va_list. */ @@ -66,7 +66,7 @@ version_etc_va (FILE *stream, fputs (_("\ \n\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later .\n\ This is free software: you are free to change and redistribute it.\n\ There is NO WARRANTY, to the extent permitted by law.\n\ \n\ @@ -170,3 +170,17 @@ version_etc (FILE *stream, va_start (authors, version); version_etc_va (stream, command_name, package, version, authors); } + +void +emit_bug_reporting_address (void) +{ + /* TRANSLATORS: The placeholder indicates the bug-reporting address + for this package. Please add _another line_ saying + "Report translation bugs to <...>\n" with the address for translation + bugs (typically your translation team's web or email address). */ + printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); + printf (_("%s home page: .\n"), + PACKAGE_NAME, PACKAGE); + fputs (_("General help using GNU software: .\n"), + stdout); +} diff --git a/lib/version-etc.h b/lib/version-etc.h index d9d1340..33a8e7f 100644 --- a/lib/version-etc.h +++ b/lib/version-etc.h @@ -1,5 +1,5 @@ -/* Utility to help print --version output in a consistent format. - Copyright (C) 1999, 2003, 2005 Free Software Foundation, Inc. +/* Print --version and bug-reporting information in a consistent format. + Copyright (C) 1999, 2003, 2005, 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,6 +31,8 @@ extern void version_etc_va (FILE *stream, extern void version_etc (FILE *stream, const char *command_name, const char *package, const char *version, - /* const char *author1, ...*/ ...); + /* const char *author1, ...*/ ...); + +extern void emit_bug_reporting_address (void); #endif /* VERSION_ETC_H */ diff --git a/lib/w32sock.h b/lib/w32sock.h new file mode 100644 index 0000000..0622985 --- /dev/null +++ b/lib/w32sock.h @@ -0,0 +1,62 @@ +/* w32sock.h --- internal auxilliary functions for Windows socket functions + + 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 . */ + +/* Written by Paolo Bonzini */ + +#include + +/* Get O_RDWR and O_BINARY. */ +#include + +/* Get _get_osfhandle() and _open_osfhandle(). */ +#include + +#define FD_TO_SOCKET(fd) ((SOCKET) _get_osfhandle ((fd))) +#define SOCKET_TO_FD(fh) (_open_osfhandle ((long) (fh), O_RDWR | O_BINARY)) + +static inline void +set_winsock_errno (void) +{ + int err = WSAGetLastError (); + WSASetLastError (0); + + /* Map some WSAE* errors to the runtime library's error codes. */ + switch (err) + { + case WSA_INVALID_HANDLE: + errno = EBADF; + break; + case WSA_NOT_ENOUGH_MEMORY: + errno = ENOMEM; + break; + case WSA_INVALID_PARAMETER: + errno = EINVAL; + break; + case WSAEWOULDBLOCK: + errno = EWOULDBLOCK; + break; + case WSAENAMETOOLONG: + errno = ENAMETOOLONG; + break; + case WSAENOTEMPTY: + errno = ENOTEMPTY; + break; + default: + errno = (err > 10000 && err < 10025) ? err - 10000 : err; + break; + } +} diff --git a/lib/wchar.in.h b/lib/wchar.in.h index dcb87b9..2d66c32 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-2008 Free Software Foundation, Inc. + Copyright (C) 2007-2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,8 +32,18 @@ @PRAGMA_SYSTEM_HEADER@ #endif -#ifdef __need_mbstate_t -/* Special invocation convention inside uClibc header files. */ +#if defined __need_mbstate_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H +/* Special invocation convention: + - Inside uClibc header files. + - On HP-UX 11.00 we have a sequence of nested includes + -> -> , and the latter includes , + once indirectly -> -> -> + and once directly. In both situations 'wint_t' is not yet defined, + therefore we cannot provide the function overrides; instead include only + the system's . + - On IRIX 6.5, similarly, we have an include -> , and + the latter includes . But here, we have no way to detect whether + is completely included or is still being included. */ #@INCLUDE_NEXT@ @NEXT_WCHAR_H@ @@ -42,6 +52,8 @@ #ifndef _GL_WCHAR_H +#define _GL_ALREADY_INCLUDING_WCHAR_H + /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be @@ -57,6 +69,8 @@ # @INCLUDE_NEXT@ @NEXT_WCHAR_H@ #endif +#undef _GL_ALREADY_INCLUDING_WCHAR_H + #ifndef _GL_WCHAR_H #define _GL_WCHAR_H @@ -70,6 +84,197 @@ extern "C" { /* Define wint_t. (Also done in wctype.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int +# ifndef WEOF +# define WEOF -1 +# endif +#endif + + +/* Override mbstate_t if it is too small. + On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for + implementing mbrtowc for encodings like UTF-8. */ +#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@ +typedef int rpl_mbstate_t; +# undef mbstate_t +# define mbstate_t rpl_mbstate_t +# define GNULIB_defined_mbstate_t 1 +#endif + + +/* Convert a single-byte character to a wide character. */ +#if @GNULIB_BTOWC@ +# if @REPLACE_BTOWC@ +# undef btowc +# define btowc rpl_btowc +# endif +# if !@HAVE_BTOWC@ || @REPLACE_BTOWC@ +extern wint_t btowc (int c); +# endif +#elif defined GNULIB_POSIXCHECK +# undef btowc +# define btowc(c) \ + (GL_LINK_WARNING ("btowc is unportable - " \ + "use gnulib module btowc for portability"), \ + btowc (c)) +#endif + + +/* Convert a wide character to a single-byte character. */ +#if @GNULIB_WCTOB@ +# if @REPLACE_WCTOB@ +# undef wctob +# define wctob rpl_wctob +# endif +# if (!defined wctob && !@HAVE_DECL_WCTOB@) || @REPLACE_WCTOB@ +/* wctob is provided by gnulib, or wctob exists but is not declared. */ +extern int wctob (wint_t wc); +# endif +#elif defined GNULIB_POSIXCHECK +# undef wctob +# define wctob(w) \ + (GL_LINK_WARNING ("wctob is unportable - " \ + "use gnulib module wctob for portability"), \ + wctob (w)) +#endif + + +/* Test whether *PS is in the initial state. */ +#if @GNULIB_MBSINIT@ +# if @REPLACE_MBSINIT@ +# undef mbsinit +# define mbsinit rpl_mbsinit +# endif +# if !@HAVE_MBSINIT@ || @REPLACE_MBSINIT@ +extern int mbsinit (const mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef mbsinit +# define mbsinit(p) \ + (GL_LINK_WARNING ("mbsinit is unportable - " \ + "use gnulib module mbsinit for portability"), \ + mbsinit (p)) +#endif + + +/* Convert a multibyte character to a wide character. */ +#if @GNULIB_MBRTOWC@ +# if @REPLACE_MBRTOWC@ +# undef mbrtowc +# define mbrtowc rpl_mbrtowc +# endif +# if !@HAVE_MBRTOWC@ || @REPLACE_MBRTOWC@ +extern size_t mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef mbrtowc +# define mbrtowc(w,s,n,p) \ + (GL_LINK_WARNING ("mbrtowc is unportable - " \ + "use gnulib module mbrtowc for portability"), \ + mbrtowc (w, s, n, p)) +#endif + + +/* Recognize a multibyte character. */ +#if @GNULIB_MBRLEN@ +# if @REPLACE_MBRLEN@ +# undef mbrlen +# define mbrlen rpl_mbrlen +# endif +# if !@HAVE_MBRLEN@ || @REPLACE_MBRLEN@ +extern size_t mbrlen (const char *s, size_t n, mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef mbrlen +# define mbrlen(s,n,p) \ + (GL_LINK_WARNING ("mbrlen is unportable - " \ + "use gnulib module mbrlen for portability"), \ + mbrlen (s, n, p)) +#endif + + +/* Convert a string to a wide string. */ +#if @GNULIB_MBSRTOWCS@ +# if @REPLACE_MBSRTOWCS@ +# undef mbsrtowcs +# define mbsrtowcs rpl_mbsrtowcs +# endif +# if !@HAVE_MBSRTOWCS@ || @REPLACE_MBSRTOWCS@ +extern size_t mbsrtowcs (wchar_t *dest, const char **srcp, size_t len, mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef mbsrtowcs +# define mbsrtowcs(d,s,l,p) \ + (GL_LINK_WARNING ("mbsrtowcs is unportable - " \ + "use gnulib module mbsrtowcs for portability"), \ + mbsrtowcs (d, s, l, p)) +#endif + + +/* Convert a string to a wide string. */ +#if @GNULIB_MBSNRTOWCS@ +# if @REPLACE_MBSNRTOWCS@ +# undef mbsnrtowcs +# define mbsnrtowcs rpl_mbsnrtowcs +# endif +# if !@HAVE_MBSNRTOWCS@ || @REPLACE_MBSNRTOWCS@ +extern size_t mbsnrtowcs (wchar_t *dest, const char **srcp, size_t srclen, size_t len, mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef mbsnrtowcs +# define mbsnrtowcs(d,s,n,l,p) \ + (GL_LINK_WARNING ("mbsnrtowcs is unportable - " \ + "use gnulib module mbsnrtowcs for portability"), \ + mbsnrtowcs (d, s, n, l, p)) +#endif + + +/* Convert a wide character to a multibyte character. */ +#if @GNULIB_WCRTOMB@ +# if @REPLACE_WCRTOMB@ +# undef wcrtomb +# define wcrtomb rpl_wcrtomb +# endif +# if !@HAVE_WCRTOMB@ || @REPLACE_WCRTOMB@ +extern size_t wcrtomb (char *s, wchar_t wc, mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef wcrtomb +# define wcrtomb(s,w,p) \ + (GL_LINK_WARNING ("wcrtomb is unportable - " \ + "use gnulib module wcrtomb for portability"), \ + wcrtomb (s, w, p)) +#endif + + +/* Convert a wide string to a string. */ +#if @GNULIB_WCSRTOMBS@ +# if @REPLACE_WCSRTOMBS@ +# undef wcsrtombs +# define wcsrtombs rpl_wcsrtombs +# endif +# if !@HAVE_WCSRTOMBS@ || @REPLACE_WCSRTOMBS@ +extern size_t wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef wcsrtombs +# define wcsrtombs(d,s,l,p) \ + (GL_LINK_WARNING ("wcsrtombs is unportable - " \ + "use gnulib module wcsrtombs for portability"), \ + wcsrtombs (d, s, l, p)) +#endif + + +/* Convert a wide string to a string. */ +#if @GNULIB_WCSNRTOMBS@ +# if !@HAVE_WCSNRTOMBS@ +extern size_t wcsnrtombs (char *dest, const wchar_t **srcp, size_t srclen, size_t len, mbstate_t *ps); +# endif +#elif defined GNULIB_POSIXCHECK +# undef wcsnrtombs +# define wcsnrtombs(d,s,n,l,p) \ + (GL_LINK_WARNING ("wcsnrtombs is unportable - " \ + "use gnulib module wcsnrtombs for portability"), \ + wcsnrtombs (d, s, n, l, p)) #endif diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c new file mode 100644 index 0000000..79df99f --- /dev/null +++ b/lib/wcrtomb.c @@ -0,0 +1,53 @@ +/* Convert wide character to multibyte character. + 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 + +#include +#include + + +size_t +wcrtomb (char *s, wchar_t wc, mbstate_t *ps) +{ + /* This implementation of wcrtomb on top of wctomb() supports only + stateless encodings. ps must be in the initial state. */ + if (ps != NULL && !mbsinit (ps)) + { + errno = EINVAL; + return (size_t)(-1); + } + + if (s == NULL) + /* We know the NUL wide character corresponds to the NUL character. */ + return 1; + else + { + int ret = wctomb (s, wc); + + if (ret >= 0) + return ret; + else + { + errno = EILSEQ; + return (size_t)(-1); + } + } +} diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 4a4f5a0..f7942ed 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -59,6 +59,9 @@ /* Define wint_t. (Also done in wchar.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int +# ifndef WEOF +# define WEOF -1 +# endif #endif /* FreeBSD 4.4 to 4.11 has but lacks the functions. diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 new file mode 100644 index 0000000..d4d04d1 --- /dev/null +++ b/m4/00gnulib.m4 @@ -0,0 +1,30 @@ +# 00gnulib.m4 serial 2 +dnl Copyright (C) 2009 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl This file must be named something that sorts before all other +dnl gnulib-provided .m4 files. It is needed until such time as we can +dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. + +# AC_DEFUN_ONCE([NAME], VALUE) +# ---------------------------- +# Define NAME to expand to VALUE on the first use (whether by direct +# expansion, or by AC_REQUIRE), and to nothing on all subsequent uses. +# Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier. This +# definition is slower than the version in Autoconf 2.64, because it +# can only use interfaces that existed since 2.59; but it achieves the +# same effect. Quoting is necessary to avoid confusing Automake. +m4_version_prereq([2.63.263], [], +[m4_define([AC][_DEFUN_ONCE], + [AC][_DEFUN([$1], + [AC_REQUIRE([_gl_DEFUN_ONCE([$1])], + [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl +[AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])]) + +# gl_00GNULIB +# ----------- +# Witness macro that this file has been included. Needed to force +# Automake to include this file prior to all other gnulib .m4 files. +AC_DEFUN([gl_00GNULIB]) diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 95f54a6..4b978e1 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ -# alloca.m4 serial 8 -dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc. +# alloca.m4 serial 9 +dnl Copyright (C) 2002-2004, 2006, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_ALLOCA], ]) if test $gl_cv_rpl_alloca = yes; then dnl OK, alloca can be implemented through a compiler built-in. - AC_DEFINE([HAVE_ALLOCA], 1, + AC_DEFINE([HAVE_ALLOCA], [1], [Define to 1 if you have 'alloca' after including , a header that may be supplied by this distribution.]) ALLOCA_H=alloca.h diff --git a/m4/argp.m4 b/m4/argp.m4 index 80cb72f..7263a56 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,5 +1,5 @@ -# argp.m4 serial 8 -dnl Copyright (C) 2003-2007 Free Software Foundation, Inc. +# argp.m4 serial 9 +dnl Copyright (C) 2003-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,18 +12,18 @@ AC_DEFUN([gl_ARGP], dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt dnl always. gl_GETOPT_SUBSTITUTE - dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ(getopt), AC_LIBOBJ(getopt1). + dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]). AC_CHECK_DECL([program_invocation_name], - [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_NAME, 1, + [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1], [Define if program_invocation_name is declared])], - [AC_DEFINE(GNULIB_PROGRAM_INVOCATION_NAME, 1, + [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1], [Define to 1 to add extern declaration of program_invocation_name to argp.h])], [#include ]) AC_CHECK_DECL([program_invocation_short_name], - [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME, 1, + [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME], [1], [Define if program_invocation_short_name is declared])], - [AC_DEFINE(GNULIB_PROGRAM_INVOCATION_SHORT_NAME, 1, + [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1], [Define to 1 to add extern declaration of program_invocation_short_name to argp.h])], [#include ]) @@ -31,21 +31,21 @@ AC_DEFUN([gl_ARGP], # are defined elsewhere. It is improbable that only one of them will # be defined and other not, I prefer to stay on the safe side and to # test each one separately. - AC_MSG_CHECKING(whether program_invocation_name is defined) + AC_MSG_CHECKING([whether program_invocation_name is defined]) AC_TRY_LINK([#include ], [ program_invocation_name = "test"; ], - [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME,1, + [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], [1], [Define if program_invocation_name is defined]) - AC_MSG_RESULT(yes)], - [ AC_MSG_RESULT(no)] ) + AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no])] ) - AC_MSG_CHECKING(whether program_invocation_short_name is defined) + AC_MSG_CHECKING([whether program_invocation_short_name is defined]) AC_TRY_LINK([#include ], [ program_invocation_short_name = "test"; ], - [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME,1, + [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1], [Define if program_invocation_short_name is defined]) - AC_MSG_RESULT(yes)], - [ AC_MSG_RESULT(no)] ) + AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no])] ) AC_CHECK_DECLS_ONCE([clearerr_unlocked]) AC_CHECK_DECLS_ONCE([feof_unlocked]) diff --git a/m4/bison.m4 b/m4/bison.m4 index 91039b1..eb05c36 100644 --- a/m4/bison.m4 +++ b/m4/bison.m4 @@ -1,6 +1,6 @@ -#serial 4 +# serial 5 -# Copyright (C) 2002, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2005, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,10 +14,10 @@ dnl Declaring YACC & YFLAGS precious will not be necessary after GNULIB dnl requires an Autoconf greater than 2.59c, but it will probably still be dnl useful to override the description of YACC in the --help output, re dnl getdate.y assuming `bison -y'. - AC_ARG_VAR(YACC, + AC_ARG_VAR([YACC], [The `Yet Another C Compiler' implementation to use. Defaults to `bison -y'. Values other than `bison -y' will most likely break on most systems.])dnl - AC_ARG_VAR(YFLAGS, + AC_ARG_VAR([YFLAGS], [YFLAGS contains the list arguments that will be passed by default to Bison. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications.])dnl diff --git a/m4/btowc.m4 b/m4/btowc.m4 new file mode 100644 index 0000000..64ff829 --- /dev/null +++ b/m4/btowc.m4 @@ -0,0 +1,68 @@ +# btowc.m4 serial 3 +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_BTOWC], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + + AC_CHECK_FUNCS_ONCE([btowc]) + if test $ac_cv_func_btowc = no; then + HAVE_BTOWC=0 + else + + dnl IRIX 6.5 btowc(EOF) is 0xFF, not WEOF. + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_FR]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether btowc(EOF) is correct], + [gl_cv_func_btowc_eof], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on IRIX. + irix*) gl_cv_func_btowc_eof="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_btowc_eof="guessing yes" ;; + esac +changequote([,])dnl + if test $LOCALE_FR != none; then + AC_TRY_RUN([ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + if (btowc (EOF) != WEOF) + return 1; + } + return 0; +}], + [gl_cv_func_btowc_eof=yes], + [gl_cv_func_btowc_eof=no], + []) + fi + ]) + case "$gl_cv_func_btowc_eof" in + *yes) ;; + *) REPLACE_BTOWC=1 ;; + esac + fi + if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + gl_REPLACE_WCHAR_H + AC_LIBOBJ([btowc]) + gl_PREREQ_BTOWC + fi +]) + +# Prerequisites of lib/btowc.c. +AC_DEFUN([gl_PREREQ_BTOWC], [ + : +]) diff --git a/m4/canonicalize-lgpl.m4 b/m4/canonicalize-lgpl.m4 index b0a7902..3a8ee2f 100644 --- a/m4/canonicalize-lgpl.m4 +++ b/m4/canonicalize-lgpl.m4 @@ -1,5 +1,5 @@ -# canonicalize-lgpl.m4 serial 4 -dnl Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc. +# canonicalize-lgpl.m4 serial 5 +dnl Copyright (C) 2003, 2006-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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,10 +8,10 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], [ dnl Do this replacement check manually because the file name is shorter dnl than the function name. - AC_CHECK_DECLS_ONCE(canonicalize_file_name) - AC_CHECK_FUNCS_ONCE(canonicalize_file_name) + AC_CHECK_DECLS_ONCE([canonicalize_file_name]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) if test $ac_cv_func_canonicalize_file_name = no; then - AC_LIBOBJ(canonicalize-lgpl) + AC_LIBOBJ([canonicalize-lgpl]) AC_DEFINE([realpath], [rpl_realpath], [Define to a replacement function name for realpath().]) gl_PREREQ_CANONICALIZE_LGPL @@ -22,14 +22,14 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], # (no AC_LIBOBJ). AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], [ - AC_CHECK_DECLS_ONCE(canonicalize_file_name) - AC_CHECK_FUNCS_ONCE(canonicalize_file_name) + AC_CHECK_DECLS_ONCE([canonicalize_file_name]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) gl_PREREQ_CANONICALIZE_LGPL ]) # Prerequisites of lib/canonicalize-lgpl.c. AC_DEFUN([gl_PREREQ_CANONICALIZE_LGPL], [ - AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) - AC_CHECK_FUNCS_ONCE(getcwd readlink) + AC_CHECK_HEADERS_ONCE([sys/param.h unistd.h]) + AC_CHECK_FUNCS_ONCE([getcwd readlink]) ]) diff --git a/m4/chown.m4 b/m4/chown.m4 index 89761f5..5d30ae3 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,8 +1,8 @@ -#serial 17 +# serial 18 # Determine whether we need the chown wrapper. -dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007 Free -dnl Software Foundation, Inc. +dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009 +dnl Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_CHOWN], AC_REQUIRE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK]) if test $ac_cv_func_chown_works = no; then - AC_DEFINE(CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE, 1, + AC_DEFINE([CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE], [1], [Define if chown is not POSIX compliant regarding IDs of -1.]) fi @@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_CHOWN], : # no wrapper needed else REPLACE_CHOWN=1 - AC_LIBOBJ(chown) + AC_LIBOBJ([chown]) gl_PREREQ_CHOWN fi ]) @@ -71,7 +71,7 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], ) if test $gl_cv_func_chown_follows_symlink = no; then - AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, + AC_DEFINE([CHOWN_MODIFIES_SYMLINK], [1], [Define if chown modifies symlinks.]) fi ]) @@ -79,5 +79,5 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], # Prerequisites of lib/chown.c. AC_DEFUN([gl_PREREQ_CHOWN], [ - AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)]) + AC_CHECK_FUNC([fchown], , [AC_LIBOBJ([fchown-stub])]) ]) diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index 227a597..d191072 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ -# clock_time.m4 serial 8 -dnl Copyright (C) 2002-2006 Free Software Foundation, Inc. +# clock_time.m4 serial 9 +dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,10 +21,10 @@ AC_DEFUN([gl_CLOCK_TIME], # programs in the package would end up linked with that potentially-shared # library, inducing unnecessary run-time overhead. gl_saved_libs=$LIBS - AC_SEARCH_LIBS(clock_gettime, [rt posix4], + AC_SEARCH_LIBS([clock_gettime], [rt posix4], [test "$ac_cv_search_clock_gettime" = "none required" || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) AC_SUBST([LIB_CLOCK_GETTIME]) - AC_CHECK_FUNCS(clock_gettime clock_settime) + AC_CHECK_FUNCS([clock_gettime clock_settime]) LIBS=$gl_saved_libs ]) diff --git a/m4/close.m4 b/m4/close.m4 index fcc9fb1..29d3abd 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -22,4 +22,6 @@ AC_DEFUN([gl_REPLACE_CLOSE], fi REPLACE_CLOSE=1 gl_REPLACE_FCLOSE + LIB_CLOSE="-lws2_32" + AC_SUBST([LIB_CLOSE]) ]) diff --git a/m4/codeset.m4 b/m4/codeset.m4 index 223955b..413217b 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ -# codeset.m4 serial 2 (gettext-0.16) -dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc. +# codeset.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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,14 +8,14 @@ dnl From Bruno Haible. AC_DEFUN([AM_LANGINFO_CODESET], [ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset], [AC_TRY_LINK([#include ], [char* cs = nl_langinfo(CODESET); return !cs;], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) + [am_cv_langinfo_codeset=yes], + [am_cv_langinfo_codeset=no]) ]) if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + AC_DEFINE([HAVE_LANGINFO_CODESET], [1], [Define if you have and nl_langinfo(CODESET).]) fi ]) diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index 6e6dab3..9bab8f1 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -1,11 +1,11 @@ -#serial 10 +# serial 11 dnl From Jim Meyering. dnl dnl Check whether struct dirent has a member named d_ino. dnl -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2006, 2007 Free Software +# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -34,7 +34,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], [gl_cv_struct_dirent_d_ino=no], [gl_cv_struct_dirent_d_ino=no])]) if test $gl_cv_struct_dirent_d_ino = yes; then - AC_DEFINE(D_INO_IN_DIRENT, 1, + AC_DEFINE([D_INO_IN_DIRENT], [1], [Define if struct dirent has a member d_ino that actually works.]) fi ] diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 index a72fc36..e507e3d 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,5 +1,5 @@ -# dirent_h.m4 serial 2 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# dirent_h.m4 serial 4 +dnl Copyright (C) 2008-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,8 +32,12 @@ AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], AC_DEFUN([gl_DIRENT_H_DEFAULTS], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR - GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) + GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) + GNULIB_SCANDIR=0; AC_SUBST([GNULIB_SCANDIR]) + GNULIB_ALPHASORT=0; AC_SUBST([GNULIB_ALPHASORT]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_DIRFD=1; AC_SUBST([HAVE_DECL_DIRFD]) + HAVE_SCANDIR=1; AC_SUBST([HAVE_SCANDIR]) + HAVE_ALPHASORT=1; AC_SUBST([HAVE_ALPHASORT]) DIRENT_H=''; AC_SUBST([DIRENT_H]) ]) diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index baab4dd..5f845f5 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,9 +1,8 @@ -#serial 15 -*- Autoconf -*- +# serial 16 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2006, 2008-2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,7 +21,7 @@ AC_DEFUN([gl_FUNC_DIRFD], AC_REQUIRE([AC_PROG_CPP]) AC_REQUIRE([AC_PROG_EGREP]) - AC_CHECK_FUNCS(dirfd) + AC_CHECK_FUNCS([dirfd]) AC_CHECK_DECLS([dirfd], , , [#include #include ]) @@ -69,7 +68,7 @@ AC_DEFUN([gl_FUNC_DIRFD], ] ) if test $gl_cv_sys_dir_fd_member_name != no_such_member; then - AC_DEFINE_UNQUOTED(DIR_FD_MEMBER_NAME, + AC_DEFINE_UNQUOTED([DIR_FD_MEMBER_NAME], $gl_cv_sys_dir_fd_member_name, [the name of the file descriptor member of DIR]) fi diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index 23bf5b0..8c6841b 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ -# double-slash-root.m4 serial 3 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# double-slash-root.m4 serial 4 -*- Autoconf -*- +dnl Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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_DOUBLE_SLASH_ROOT], fi fi]) if test "$gl_cv_double_slash_root" = yes; then - AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], 1, + AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], [1], [Define to 1 if // is a file system root distinct from /.]) fi ]) diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index adcfd06..3c9c0b5 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ -# eealloc.m4 serial 1 -dnl Copyright (C) 2003 Free Software Foundation, Inc. +# eealloc.m4 serial 2 +dnl Copyright (C) 2003, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ AC_DEFUN([gl_EEMALLOC], _AC_FUNC_MALLOC_IF( [gl_cv_func_malloc_0_nonnull=1], [gl_cv_func_malloc_0_nonnull=0]) - AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], $gl_cv_func_malloc_0_nonnull, + AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull], [If malloc(0) is != NULL, define this to 1. Otherwise define this to 0.]) ]) @@ -26,7 +26,7 @@ AC_DEFUN([gl_EEREALLOC], _AC_FUNC_REALLOC_IF( [gl_cv_func_realloc_0_nonnull=1], [gl_cv_func_realloc_0_nonnull=0]) - AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], $gl_cv_func_realloc_0_nonnull, + AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], [$gl_cv_func_realloc_0_nonnull], [If realloc(NULL,0) is != NULL, define this to 1. Otherwise define this to 0.]) ]) diff --git a/m4/environ.m4 b/m4/environ.m4 index fac0c05..b17bb60 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ -# environ.m4 serial 1 -dnl Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc. +# environ.m4 serial 2 +dnl Copyright (C) 2001-2004, 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,13 +21,13 @@ AC_DEFUN([gt_CHECK_VAR_DECL], [ define([gt_cv_var], [gt_cv_var_]$2[_declaration]) AC_MSG_CHECKING([if $2 is properly declared]) - AC_CACHE_VAL(gt_cv_var, [ + AC_CACHE_VAL([gt_cv_var], [ AC_TRY_COMPILE([$1 extern struct { int foo; } $2;], [$2.foo = 1;], gt_cv_var=no, gt_cv_var=yes)]) - AC_MSG_RESULT($gt_cv_var) + AC_MSG_RESULT([$gt_cv_var]) if test $gt_cv_var = yes; then AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_DECL], 1, [Define if you have the declaration of $2.]) diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index b5af078..4d77672 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,21 +1,15 @@ -# errno_h.m4 serial 1 -dnl Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc. +# errno_h.m4 serial 4 +dnl Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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], +dnl This macro must pass through AC_REQUIRE (never directly invoke it). +AC_DEFUN_ONCE([gl_HEADER_ERRNO_H], [ AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([for complete errno.h], gl_cv_header_errno_h_complete, [ - AC_EGREP_CPP(booboo,[ + AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [ + AC_EGREP_CPP([booboo],[ #include #if !defined ENOMSG booboo @@ -70,7 +64,7 @@ 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,[ + AC_EGREP_CPP([yes],[ #include #ifdef ]$1[ yes @@ -79,7 +73,7 @@ yes [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,[ + AC_EGREP_CPP([yes],[ #define _XOPEN_SOURCE_EXTENDED 1 #include #ifdef ]$1[ @@ -111,3 +105,9 @@ yes AC_SUBST($1[_VALUE]) 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/extensions.m4 b/m4/extensions.m4 index 917af94..ba6d5e1 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ -# serial 5 -*- Autoconf -*- +# serial 8 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,10 +20,12 @@ # AC_DEFINE. The goal here is to define all known feature-enabling # macros, then, if reports of conflicts are made, disable macros that # cause problems on some platforms (such as __EXTENSIONS__). -AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], +AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS], [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl AC_BEFORE([$0], [AC_RUN_IFELSE])dnl + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=]) if test "$MINIX" = yes; then AC_DEFINE([_POSIX_SOURCE], [1], @@ -36,6 +38,16 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl [Define to 1 if on MINIX.]) fi + dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500, + dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already + dnl provided. + case "$host_os" in + hpux*) + AC_DEFINE([_XOPEN_SOURCE], [500], + [Define to 500 only on HP-UX.]) + ;; + esac + AH_VERBATIM([__EXTENSIONS__], [/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE @@ -78,5 +90,15 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl # ------------------------ # Enable extensions on systems that normally disable them, # typically due to standards-conformance issues. -AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS], - [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])]) +AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS], +[ + dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS. + dnl gnulib does not need it. But if it gets required by third-party macros + dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a + dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS". + dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE, + dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck. + AC_REQUIRE([AC_GNU_SOURCE]) + + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) +]) diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index 1d3e5fe..d5dd3e2 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ -# fchdir.m4 serial 6 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# fchdir.m4 serial 7 +dnl Copyright (C) 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_FCHDIR], REPLACE_FCHDIR=1 AC_LIBOBJ([fchdir]) gl_PREREQ_FCHDIR - AC_DEFINE([FCHDIR_REPLACEMENT], 1, + AC_DEFINE([FCHDIR_REPLACEMENT], [1], [Define if gnulib's fchdir() replacement is used.]) gl_REPLACE_OPEN gl_REPLACE_CLOSE diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index e3b9aa5..4a7fc42 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,5 +1,5 @@ # Configure fcntl.h. -dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_FCNTL_H], [ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) - AC_CACHE_CHECK([for working fcntl.h], gl_cv_header_working_fcntl_h, + AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4 index 5fb6311..0a9c0a5 100644 --- a/m4/fileblocks.m4 +++ b/m4/fileblocks.m4 @@ -1,5 +1,5 @@ -# fileblocks.m4 serial 4 -dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc. +# fileblocks.m4 serial 5 +dnl Copyright (C) 2002, 2005, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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_FILEBLOCKS], [ AC_STRUCT_ST_BLOCKS - dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ(fileblocks). + dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ([fileblocks]). if test $ac_cv_member_struct_stat_st_blocks = no; then gl_PREREQ_FILEBLOCKS fi @@ -15,6 +15,6 @@ AC_DEFUN([gl_FILEBLOCKS], # Prerequisites of lib/fileblocks.c. AC_DEFUN([gl_PREREQ_FILEBLOCKS], [ - AC_CHECK_HEADERS_ONCE(sys/param.h) + AC_CHECK_HEADERS_ONCE([sys/param.h]) : ]) diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 495cbf9..47bb36b 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,7 +1,6 @@ # Check for fnmatch - serial 2. -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 2000-2007, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -9,7 +8,7 @@ # Autoconf defines AC_FUNC_FNMATCH, but that is obsolescent. # New applications should use the macros below instead. -# _AC_FUNC_FNMATCH_IF(STANDARD = GNU | POSIX, CACHE_VAR, IF-TRUE, IF-FALSE) +# _AC_FUNC_FNMATCH_IF([STANDARD = GNU | POSIX], [CACHE_VAR], [IF-TRUE], [IF-FALSE]) # ------------------------------------------------------------------------- # If a STANDARD compliant fnmatch is found, run IF-TRUE, otherwise # IF-FALSE. Use CACHE_VAR. diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 65d2ddd..7860d70 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,7 +1,6 @@ -#serial 13 +# serial 14 -# Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007, 2008 Free Software -# Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,7 +15,7 @@ dnl we have to grub around in the FILE struct. AC_DEFUN([gl_FUNC_FPENDING], [ - AC_CHECK_HEADERS_ONCE(stdio_ext.h) + AC_CHECK_HEADERS_ONCE([stdio_ext.h]) AC_CHECK_FUNCS_ONCE([__fpending]) fp_headers=' # include @@ -78,7 +77,7 @@ AC_DEFUN([gl_FUNC_FPENDING], ac_cv_sys_pending_output_n_bytes=$ac_expr ] ) - AC_DEFINE_UNQUOTED(PENDING_OUTPUT_N_BYTES, + AC_DEFINE_UNQUOTED([PENDING_OUTPUT_N_BYTES], $ac_cv_sys_pending_output_n_bytes, [the number of pending output bytes on stream `fp']) AC_LIBOBJ([fpending]) diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index b7f346a..e43c15f 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,8 +1,8 @@ -#serial 13 +# serial 14 # See if we need to emulate a missing ftruncate function using fcntl or chsize. -# Copyright (C) 2000, 2001, 2003-2007 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2003-2007, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -42,5 +42,5 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], # Prerequisites of lib/ftruncate.c. AC_DEFUN([gl_PREREQ_FTRUNCATE], [ - AC_CHECK_FUNCS(chsize) + AC_CHECK_FUNCS([chsize]) ]) diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 index a431a7c..07e2c18 100644 --- a/m4/getcwd-abort-bug.m4 +++ b/m4/getcwd-abort-bug.m4 @@ -1,9 +1,9 @@ -#serial 1 +# serial 2 # Determine whether getcwd aborts when the length of the working directory # name is unusually large. Any length between 4k and 16k trigger the bug # when using glibc-2.4.90-9 or older. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG], [ - AC_CHECK_DECLS_ONCE(getcwd) - AC_CHECK_FUNCS(getpagesize) + AC_CHECK_DECLS_ONCE([getcwd]) + AC_CHECK_FUNCS([getpagesize]) AC_CACHE_CHECK([whether getcwd aborts when 4k < cwd_length < 16k], gl_cv_func_getcwd_abort_bug, [# Remove any remnants of a previous test. diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 5e6d58b..1478499 100644 --- a/m4/getcwd-path-max.m4 +++ b/m4/getcwd-path-max.m4 @@ -1,4 +1,4 @@ -#serial 13 +# serial 14 # Check for several getcwd bugs with long file names. # If so, arrange to compile the wrapper function. @@ -6,7 +6,7 @@ # I've heard that this is due to a Linux kernel bug, and that it has # been fixed between 2.4.21-pre3 and 2.4.21-pre4. */ -# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_GETCWD_PATH_MAX], [ - AC_CHECK_DECLS_ONCE(getcwd) + AC_CHECK_DECLS_ONCE([getcwd]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CACHE_CHECK([whether getcwd handles long file names properly], gl_cv_func_getcwd_path_max, @@ -181,7 +181,7 @@ main () ]) case $gl_cv_func_getcwd_path_max in no,*) - AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], 1, + AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], [1], [Define to 1 if getcwd works, except it sometimes fails when it shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT. If __GETCWD_PREFIX is not defined, it doesn't matter whether HAVE_PARTLY_WORKING_GETCWD diff --git a/m4/getdate.m4 b/m4/getdate.m4 index c335243..67f9c65 100644 --- a/m4/getdate.m4 +++ b/m4/getdate.m4 @@ -1,5 +1,5 @@ -# getdate.m4 serial 13 -dnl Copyright (C) 2002-2006, 2008 Free Software Foundation, Inc. +# getdate.m4 serial 14 +dnl Copyright (C) 2002-2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,14 +12,14 @@ 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_CACHE_CHECK([for compound literals], [gl_cv_compound_literals], [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, gl_cv_compound_literals=no)]) if test $gl_cv_compound_literals = yes; then - AC_DEFINE(HAVE_COMPOUND_LITERALS, 1, + AC_DEFINE([HAVE_COMPOUND_LITERALS], [1], [Define if you have compound literals.]) fi ]) diff --git a/m4/getline.m4 b/m4/getline.m4 index 57625da..9993345 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,7 +1,6 @@ -# getline.m4 serial 18 +# getline.m4 serial 19 -dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 Free -dnl Software Foundation, Inc. +dnl Copyright (C) 1998-2003, 2005-2007, 2009 Free Software Foundation, Inc. dnl dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_PREREQ([2.59]) dnl See if there's a working, system-supplied version of the getline function. -dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems +dnl We can't just do AC_REPLACE_FUNCS([getline]) because some systems dnl have a function by that name in -linet that doesn't have anything dnl to do with the function we need. AC_DEFUN([gl_FUNC_GETLINE], @@ -23,12 +22,12 @@ AC_DEFUN([gl_FUNC_GETLINE], AC_CHECK_DECLS_ONCE([getline]) gl_getline_needs_run_time_check=no - AC_CHECK_FUNC(getline, + AC_CHECK_FUNC([getline], dnl Found it in some library. Verify that it works. gl_getline_needs_run_time_check=yes, am_cv_func_working_getline=no) if test $gl_getline_needs_run_time_check = yes; then - AC_CACHE_CHECK([for working getline function], am_cv_func_working_getline, + AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline], [echo fooN |tr -d '\012'|tr N '\012' > conftest.data AC_TRY_RUN([ # include diff --git a/m4/gettext.m4 b/m4/gettext.m4 index b4511ce..ffec9de 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 60 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# gettext.m4 serial 62 (gettext-0.18) +dnl Copyright (C) 1995-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -123,11 +123,11 @@ AC_DEFUN([AM_GNU_GETTEXT], gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -267,7 +267,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -301,9 +301,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -319,9 +319,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -329,36 +329,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(GENCAT) + AC_SUBST([GENCAT]) dnl For backward compatibility. Some Makefiles may be using this. INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi - AC_SUBST(INTLOBJS) + AC_SUBST([INTLOBJS]) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) diff --git a/m4/gettime.m4 b/m4/gettime.m4 index 601a5e6..11643e8 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ -# gettime.m4 serial 6 -dnl Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. +# gettime.m4 serial 7 +dnl Copyright (C) 2002, 2004, 2005, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,5 +11,5 @@ AC_DEFUN([gl_GETTIME], dnl Prerequisites of lib/gettime.c. AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_TIMESPEC]) - AC_CHECK_FUNCS_ONCE(gettimeofday nanotime) + AC_CHECK_FUNCS_ONCE([gettimeofday nanotime]) ]) diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index b9bbb10..0fec7d4 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -#serial 11 +# serial 12 -# Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY], REPLACE_GETTIMEOFDAY=1 SYS_TIME_H=sys/time.h if test $gl_cv_func_gettimeofday_clobber != yes; then - AC_LIBOBJ(gettimeofday) + AC_LIBOBJ([gettimeofday]) gl_PREREQ_GETTIMEOFDAY fi fi @@ -80,13 +80,13 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], REPLACE_GETTIMEOFDAY=1 SYS_TIME_H=sys/time.h gl_GETTIMEOFDAY_REPLACE_LOCALTIME - AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1, + AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1], [Define if gettimeofday clobbers the localtime buffer.]) fi ]) AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - AC_LIBOBJ(gettimeofday) + AC_LIBOBJ([gettimeofday]) gl_PREREQ_GETTIMEOFDAY AC_DEFINE([gmtime], [rpl_gmtime], [Define to rpl_gmtime if the replacement function should be used.]) diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index d95fd98..93fbf47 100644 --- a/m4/glibc21.m4 +++ b/m4/glibc21.m4 @@ -1,5 +1,5 @@ -# glibc21.m4 serial 3 -dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc. +# glibc21.m4 serial 4 +dnl Copyright (C) 2000-2002, 2004, 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,8 +9,8 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_GLIBC21], [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, + AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer], + [ac_cv_gnu_library_2_1], [AC_EGREP_CPP([Lucky GNU user], [ #include @@ -20,11 +20,11 @@ AC_DEFUN([gl_GLIBC21], #endif #endif ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) + [ac_cv_gnu_library_2_1=yes], + [ac_cv_gnu_library_2_1=no]) ] ) - AC_SUBST(GLIBC21) + AC_SUBST([GLIBC21]) GLIBC21="$ac_cv_gnu_library_2_1" ] ) diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index c73db14..50e399a 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 6 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# gnulib-common.m4 serial 10 +dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,6 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. # 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_00GNULIB]) AC_REQUIRE([gl_COMMON_BODY]) ]) AC_DEFUN([gl_COMMON_BODY], [ @@ -52,7 +53,7 @@ m4_ifndef([m4_foreach_w], # is a backport of autoconf-2.60's AC_PROG_MKDIR_P. # Remove this macro when we can assume autoconf >= 2.60. m4_ifdef([AC_PROG_MKDIR_P], [], [ - AC_DEFUN([AC_PROG_MKDIR_P], + AC_DEFUN_ONCE([AC_PROG_MKDIR_P], [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake MKDIR_P='$(mkdir_p)' AC_SUBST([MKDIR_P])])]) @@ -63,7 +64,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [], [ # works. # This definition can be removed once autoconf >= 2.62 can be assumed. AC_DEFUN([AC_C_RESTRICT], -[AC_CACHE_CHECK([for C/C++ restrict keyword], ac_cv_c_restrict, +[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no # The order here caters to the fact that C++ does not require restrict. for ac_kw in __restrict __restrict__ _Restrict restrict; do @@ -99,3 +100,12 @@ AC_DEFUN([AC_C_RESTRICT], *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; esac ]) + +# gl_BIGENDIAN +# is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. +# Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some +# macros invoke AC_C_BIGENDIAN with arguments. +AC_DEFUN([gl_BIGENDIAN], +[ + AC_C_BIGENDIAN +]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 6bcd83c..6eea276 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,7 +1,7 @@ # -*- buffer-read-only: t -*- vi: set ro: # DO NOT EDIT! GENERATED AUTOMATICALLY! # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2009 Free Software Foundation, Inc. # # This file is free software, distributed under the terms of the GNU # General Public License. As a special exception to the GNU General @@ -28,7 +28,6 @@ AC_DEFUN([gl_EARLY], m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable AC_REQUIRE([AC_PROG_RANLIB]) AC_REQUIRE([AM_PROG_CC_C_O]) - AC_REQUIRE([AC_GNU_SOURCE]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([AC_FUNC_FSEEKO]) dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode @@ -60,6 +59,8 @@ AC_DEFUN([gl_INIT], [AM_XGETTEXT_OPTION([--flag=argp_error:2:c-format]) AM_XGETTEXT_OPTION([--flag=argp_failure:4:c-format])]) gl_BACKUPFILE + gl_FUNC_BTOWC + gl_WCHAR_MODULE_INDICATOR([btowc]) gl_CANONICALIZE_LGPL gl_MODULE_INDICATOR([canonicalize-lgpl]) gl_FUNC_CHDIR_LONG @@ -81,7 +82,7 @@ AC_DEFUN([gl_INIT], gl_UNISTD_MODULE_INDICATOR([dup2]) gl_ENVIRON gl_UNISTD_MODULE_INDICATOR([environ]) - gl_HEADER_ERRNO_H + AC_REQUIRE([gl_HEADER_ERRNO_H]) gl_ERROR m4_ifdef([AM_XGETTEXT_OPTION], [AM_XGETTEXT_OPTION([--flag=error:3:c-format]) @@ -140,19 +141,22 @@ AC_DEFUN([gl_INIT], gl_STDLIB_MODULE_INDICATOR([malloc-posix]) gl_MALLOCA gl_MBCHAR + gl_FUNC_MBRTOWC + gl_WCHAR_MODULE_INDICATOR([mbrtowc]) gl_FUNC_MBSCASECMP gl_STRING_MODULE_INDICATOR([mbscasecmp]) + gl_FUNC_MBSINIT + gl_WCHAR_MODULE_INDICATOR([mbsinit]) gl_MBITER - gl_FUNC_MEMCHR gl_FUNC_MEMPCPY gl_STRING_MODULE_INDICATOR([mempcpy]) gl_FUNC_MEMRCHR gl_STRING_MODULE_INDICATOR([memrchr]) - gl_FUNC_MEMSET gt_FUNC_MKDTEMP gl_STDLIB_MODULE_INDICATOR([mkdtemp]) gl_FUNC_MKTIME gl_MODECHANGE + AC_REQUIRE([gl_MULTIARCH]) AC_FUNC_OBSTACK dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]). gl_FUNC_OPEN @@ -169,7 +173,6 @@ AC_DEFUN([gl_INIT], gl_FUNC_REALLOC_POSIX gl_STDLIB_MODULE_INDICATOR([realloc-posix]) gl_REGEX - gl_FUNC_RMDIR gl_FUNC_RPMATCH gl_STDLIB_MODULE_INDICATOR([rpmatch]) gl_SAFE_READ @@ -178,6 +181,7 @@ AC_DEFUN([gl_INIT], gl_SAVEDIR gl_FUNC_SETENV gl_STDLIB_MODULE_INDICATOR([setenv]) + gl_SIZE_MAX gl_FUNC_SLEEP gl_UNISTD_MODULE_INDICATOR([sleep]) gl_FUNC_SNPRINTF @@ -195,7 +199,7 @@ AC_DEFUN([gl_INIT], gl_STRCASE gl_FUNC_STRCHRNUL gl_STRING_MODULE_INDICATOR([strchrnul]) - gl_FUNC_STRDUP + gl_FUNC_STRDUP_POSIX gl_STRING_MODULE_INDICATOR([strdup]) gl_FUNC_STRERROR gl_STRING_MODULE_INDICATOR([strerror]) @@ -236,6 +240,8 @@ AC_DEFUN([gl_INIT], gl_FUNC_VSNPRINTF gl_STDIO_MODULE_INDICATOR([vsnprintf]) gl_WCHAR_H + gl_FUNC_WCRTOMB + gl_WCHAR_MODULE_INDICATOR([wcrtomb]) gl_WCTYPE_H gl_FUNC_WCWIDTH gl_WCHAR_MODULE_INDICATOR([wcwidth]) @@ -403,6 +409,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/backupfile.c lib/backupfile.h lib/basename.c + lib/btowc.c lib/c-ctype.c lib/c-ctype.h lib/canonicalize-lgpl.c @@ -485,12 +492,12 @@ AC_DEFUN([gl_FILE_LIST], [ lib/malloca.valgrind lib/mbchar.c lib/mbchar.h + lib/mbrtowc.c lib/mbscasecmp.c + lib/mbsinit.c lib/mbuiter.h - lib/memchr.c lib/mempcpy.c lib/memrchr.c - lib/memset.c lib/mkdirat.c lib/mkdtemp.c lib/mktime.c @@ -528,7 +535,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/regex_internal.c lib/regex_internal.h lib/regexec.c - lib/rmdir.c lib/rpmatch.c lib/safe-read.c lib/safe-read.h @@ -540,6 +546,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/savedir.c lib/savedir.h lib/setenv.c + lib/size_max.h lib/sleep.c lib/snprintf.c lib/stat-macros.h @@ -603,7 +610,9 @@ AC_DEFUN([gl_FILE_LIST], [ lib/version-etc.c lib/version-etc.h lib/vsnprintf.c + lib/w32sock.h lib/wchar.in.h + lib/wcrtomb.c lib/wctype.in.h lib/wcwidth.c lib/write.c @@ -620,11 +629,13 @@ AC_DEFUN([gl_FILE_LIST], [ lib/xstrtol.h lib/xstrtoul.c lib/xstrtoumax.c + m4/00gnulib.m4 m4/alloca.m4 m4/argmatch.m4 m4/argp.m4 m4/backupfile.m4 m4/bison.m4 + m4/btowc.m4 m4/canonicalize-lgpl.m4 m4/chdir-long.m4 m4/chown.m4 @@ -692,6 +703,9 @@ AC_DEFUN([gl_FILE_LIST], [ m4/lib-link.m4 m4/lib-prefix.m4 m4/localcharset.m4 + m4/locale-fr.m4 + m4/locale-ja.m4 + m4/locale-zh.m4 m4/lock.m4 m4/longlong.m4 m4/lseek.m4 @@ -702,14 +716,14 @@ AC_DEFUN([gl_FILE_LIST], [ m4/mbiter.m4 m4/mbrtowc.m4 m4/mbscasecmp.m4 + m4/mbsinit.m4 m4/mbstate_t.m4 - m4/memchr.m4 m4/mempcpy.m4 m4/memrchr.m4 - m4/memset.m4 m4/mkdtemp.m4 m4/mktime.m4 m4/modechange.m4 + m4/multiarch.m4 m4/nls.m4 m4/open.m4 m4/openat.m4 @@ -724,7 +738,6 @@ AC_DEFUN([gl_FILE_LIST], [ m4/readlink.m4 m4/realloc.m4 m4/regex.m4 - m4/rmdir.m4 m4/rpmatch.m4 m4/safe-read.m4 m4/safe-write.m4 @@ -781,6 +794,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/vsnprintf.m4 m4/wchar.m4 m4/wchar_t.m4 + m4/wcrtomb.m4 m4/wctype.m4 m4/wcwidth.m4 m4/wint_t.m4 diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 66bc76f..3cc6268 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM6 (gettext-0.17) -dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. +# iconv.m4 serial AM7 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -34,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK], am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no AC_TRY_LINK([#include @@ -42,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_func_iconv=yes) + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -51,13 +51,13 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then @@ -134,7 +134,7 @@ int main () am_func_iconv=no am_cv_lib_iconv=no fi if test "$am_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, + AC_DEFINE([HAVE_ICONV], [1], [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then @@ -147,8 +147,8 @@ int main () LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) AC_DEFUN([AM_ICONV], @@ -156,7 +156,7 @@ AC_DEFUN([AM_ICONV], AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_CACHE_VAL([am_cv_proto_iconv], [ AC_TRY_COMPILE([ #include #include @@ -169,12 +169,12 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") +], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + AC_MSG_RESULT([${ac_t:- + }$am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) fi ]) diff --git a/m4/include_next.m4 b/m4/include_next.m4 index b6e4d3a..7522639 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ -# include_next.m4 serial 8 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# include_next.m4 serial 11 +dnl Copyright (C) 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,6 +11,10 @@ dnl dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to dnl 'include' otherwise. dnl +dnl INCLUDE_NEXT_AS_FIRST_DIRECTIVE expands to 'include_next' if the compiler +dnl supports it in the special case that it is the first include directive in +dnl the given file, or to '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 @@ -26,12 +30,26 @@ AC_DEFUN([gl_INCLUDE_NEXT], AC_LANG_PREPROC_REQUIRE() AC_CACHE_CHECK([whether the preprocessor supports 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 + [rm -rf conftestd1a conftestd1b conftestd2 + mkdir conftestd1a conftestd1b conftestd2 + dnl The include of is because IBM C 9.0, 10.1 (original + dnl versions, prior to 2009-01 updates) on AIX 6.1 supports include_next + dnl when used as first preprocessor directive in a file, but not when + dnl preceded by another include directive. Additionally, with this same + dnl compiler, include_next is a no-op when used in a header file that was + dnl included by specifying its absolute file name. Despite these two bugs, + dnl include_next is used in the compiler's . By virtue of the + dnl second bug, we need to use include_next as well in this case. + cat < conftestd1a/conftest.h +#define DEFINED_IN_CONFTESTD1 +#include_next +#ifdef DEFINED_IN_CONFTESTD2 +int foo; +#else +#error "include_next doesn't work" +#endif +EOF + cat < conftestd1b/conftest.h #define DEFINED_IN_CONFTESTD1 #include #include_next @@ -47,24 +65,36 @@ EOF #endif #define DEFINED_IN_CONFTESTD2 EOF - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -Iconftestd1 -Iconftestd2" + gl_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2" AC_COMPILE_IFELSE([#include ], [gl_cv_have_include_next=yes], - [gl_cv_have_include_next=no]) - CPPFLAGS="$save_CPPFLAGS" - rm -rf conftestd1 conftestd2 + [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2" + AC_COMPILE_IFELSE([#include ], + [gl_cv_have_include_next=buggy], + [gl_cv_have_include_next=no]) + ]) + CPPFLAGS="$gl_save_CPPFLAGS" + rm -rf conftestd1a conftestd1b conftestd2 ]) PRAGMA_SYSTEM_HEADER= if test $gl_cv_have_include_next = yes; then INCLUDE_NEXT=include_next + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next if test -n "$GCC"; then PRAGMA_SYSTEM_HEADER='#pragma GCC system_header' fi else - INCLUDE_NEXT=include + if test $gl_cv_have_include_next = buggy; then + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include_next + else + INCLUDE_NEXT=include + INCLUDE_NEXT_AS_FIRST_DIRECTIVE=include + fi fi AC_SUBST([INCLUDE_NEXT]) + AC_SUBST([INCLUDE_NEXT_AS_FIRST_DIRECTIVE]) AC_SUBST([PRAGMA_SYSTEM_HEADER]) ]) @@ -87,6 +117,7 @@ EOF AC_DEFUN([gl_CHECK_NEXT_HEADERS], [ AC_REQUIRE([gl_INCLUDE_NEXT]) + AC_REQUIRE([AC_CANONICAL_HOST]) AC_CHECK_HEADERS_ONCE([$1]) m4_foreach_w([gl_HEADER_NAME], [$1], @@ -105,11 +136,22 @@ AC_DEFUN([gl_CHECK_NEXT_HEADERS], [AC_LANG_SOURCE( [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] )]) - dnl eval is necessary to expand ac_cpp. + dnl AIX "xlc -E" and "cc -E" omit #line directives for header files + dnl that contain only a #include of other header files and no + dnl non-comment tokens of their own. This leads to a failure to + dnl detect the absolute name of , , + dnl and others. The workaround is to force preservation of comments + dnl through option -C. This ensures all necessary #line directives + dnl are present. GCC supports option -C as well. + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + dnl eval is necessary to expand gl_absname_cpp. dnl Ultrix and Pyramid sh refuse to redirect output of eval, dnl so use subshell. AS_VAR_SET([gl_next_header], - ['"'`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{ s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1# s#^/[^/]#//&# diff --git a/m4/inline.m4 b/m4/inline.m4 index a07076c..cee5109 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ -# inline.m4 serial 3 -dnl Copyright (C) 2006 Free Software Foundation, Inc. +# inline.m4 serial 4 +dnl Copyright (C) 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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_INLINE], fi ]) if test $gl_cv_c_inline_effective = yes; then - AC_DEFINE([HAVE_INLINE], 1, + AC_DEFINE([HAVE_INLINE], [1], [Define to 1 if the compiler supports one of the keywords 'inline', '__inline__', '__inline' and effectively inlines functions marked as such.]) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index d3f0d90..c24837c 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 1 (gettext-0.17) -dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. +# intlmacosx.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2004-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,7 +19,7 @@ AC_DEFUN([gt_INTL_MACOSX], [ dnl Check for API introduced in MacOS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, + [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_TRY_LINK([#include ], @@ -28,11 +28,11 @@ AC_DEFUN([gt_INTL_MACOSX], [gt_cv_func_CFPreferencesCopyAppValue=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], @@ -40,7 +40,7 @@ AC_DEFUN([gt_INTL_MACOSX], [gt_cv_func_CFLocaleCopyCurrent=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index 50ae35d..264cb57 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,12 +1,12 @@ -# intmax_t.m4 serial 6 -dnl Copyright (C) 1997-2004, 2006-2007 Free Software Foundation, Inc. +# intmax_t.m4 serial 7 +dnl Copyright (C) 1997-2004, 2006-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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 Paul Eggert. -AC_PREREQ(2.13) +AC_PREREQ([2.13]) # Define intmax_t to 'long' or 'long long' # if it is not already defined in or . @@ -22,10 +22,10 @@ AC_DEFUN([gl_AC_TYPE_INTMAX_T], test $ac_cv_type_long_long_int = yes \ && ac_type='long long' \ || ac_type='long' - AC_DEFINE_UNQUOTED(intmax_t, $ac_type, + AC_DEFINE_UNQUOTED([intmax_t], [$ac_type], [Define to long or long long if and don't define.]) else - AC_DEFINE(HAVE_INTMAX_T, 1, + AC_DEFINE([HAVE_INTMAX_T], [1], [Define if you have the 'intmax_t' type in or .]) fi ]) @@ -36,7 +36,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T], [ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, + AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t], [AC_TRY_COMPILE([ #include #include @@ -48,14 +48,14 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T], #endif ], [intmax_t x = -1; return !x;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE(HAVE_INTMAX_T, 1, + AC_DEFINE([HAVE_INTMAX_T], [1], [Define if you have the 'intmax_t' type in or .]) else AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) test $ac_cv_type_long_long_int = yes \ && ac_type='long long' \ || ac_type='long' - AC_DEFINE_UNQUOTED(intmax_t, $ac_type, + AC_DEFINE_UNQUOTED([intmax_t], [$ac_type], [Define to long or long long if and don't define.]) fi ]) diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index 7c7f894..98fec7b 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,12 +1,12 @@ -# inttypes-pri.m4 serial 4 (gettext-0.16) -dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. +# inttypes-pri.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1997-2002, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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. -AC_PREREQ(2.52) +AC_PREREQ([2.52]) # Define PRI_MACROS_BROKEN if exists and defines the PRI* # macros to non-string values. This is the case on AIX 4.3.3. @@ -16,17 +16,17 @@ AC_DEFUN([gt_INTTYPES_PRI], AC_CHECK_HEADERS([inttypes.h]) if test $ac_cv_header_inttypes_h = yes; then AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - gt_cv_inttypes_pri_broken, + [gt_cv_inttypes_pri_broken], [ AC_TRY_COMPILE([#include #ifdef PRId32 char *p = PRId32; #endif -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) +], [], [gt_cv_inttypes_pri_broken=no], [gt_cv_inttypes_pri_broken=yes]) ]) fi if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, + AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1], [Define if exists and defines unusable PRI* macros.]) PRI_MACROS_BROKEN=1 else diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index d84cead..8b4e4f8 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ -# inttypes.m4 serial 12 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# inttypes.m4 serial 14 +dnl Copyright (C) 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -144,13 +144,15 @@ const char *l = /* implicit string concatenation */ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([inttypes.h]) + AC_REQUIRE([gl_MULTIARCH]) + dnl Ensure that defines the limit macros, since gnulib's dnl relies on them. This macro is only needed when a dnl C++ compiler is in use; it has no effect for a C compiler. dnl Also be careful to define __STDC_LIMIT_MACROS only when gnulib's dnl is going to be created, and to avoid redefinition warnings dnl if the __STDC_LIMIT_MACROS is already defined through the CPPFLAGS. - AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], 1, + AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], [1], [Define to make the limit macros in visible.]) AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ], [/* Ensure that defines the limit macros, since gnulib's @@ -212,25 +214,33 @@ const char *l = /* implicit string concatenation */ [defined INT32_MAX && defined INTMAX_MAX], [INT32_MAX < INTMAX_MAX], [sizeof (int) < sizeof (long long int)]) - gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( - [INT64_MAX_EQ_LONG_MAX], - [defined INT64_MAX], - [INT64_MAX == LONG_MAX], - [sizeof (long long int) == sizeof (long int)]) + if test $APPLE_UNIVERSAL_BUILD = 0; then + gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( + [INT64_MAX_EQ_LONG_MAX], + [defined INT64_MAX], + [INT64_MAX == LONG_MAX], + [sizeof (long long int) == sizeof (long int)]) + else + INT64_MAX_EQ_LONG_MAX=-1 + fi gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( [UINT32_MAX_LT_UINTMAX_MAX], [defined UINT32_MAX && defined UINTMAX_MAX], [UINT32_MAX < UINTMAX_MAX], [sizeof (unsigned int) < sizeof (unsigned long long int)]) - gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( - [UINT64_MAX_EQ_ULONG_MAX], - [defined UINT64_MAX], - [UINT64_MAX == ULONG_MAX], - [sizeof (unsigned long long int) == sizeof (unsigned long int)]) + if test $APPLE_UNIVERSAL_BUILD = 0; then + gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION( + [UINT64_MAX_EQ_ULONG_MAX], + [defined UINT64_MAX], + [UINT64_MAX == ULONG_MAX], + [sizeof (unsigned long long int) == sizeof (unsigned long int)]) + else + UINT64_MAX_EQ_ULONG_MAX=-1 + fi INTTYPES_H='inttypes.h' fi - AC_SUBST(INTTYPES_H) + AC_SUBST([INTTYPES_H]) ]) # Define the symbol $1 to be 1 if the condition is true, 0 otherwise. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index edc8ecb..f4ca160 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ -# inttypes_h.m4 serial 7 -dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. +# inttypes_h.m4 serial 9 +dnl Copyright (C) 1997-2004, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,15 +11,15 @@ dnl From Paul Eggert. AC_DEFUN([gl_AC_HEADER_INTTYPES_H], [ - AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h, + AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h], [AC_TRY_COMPILE( [#include #include ], [uintmax_t i = (uintmax_t) -1; return !i;], - gl_cv_header_inttypes_h=yes, - gl_cv_header_inttypes_h=no)]) + [gl_cv_header_inttypes_h=yes], + [gl_cv_header_inttypes_h=no])]) if test $gl_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, + AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1], [Define if exists, doesn't clash with , and declares uintmax_t. ]) fi diff --git a/m4/lchown.m4 b/m4/lchown.m4 index b719ed0..f509fde 100644 --- a/m4/lchown.m4 +++ b/m4/lchown.m4 @@ -1,8 +1,7 @@ -#serial 12 +# serial 13 # Determine whether we need the lchown wrapper. -dnl Copyright (C) 1998, 2001, 2003, 2004, 2005, 2006, 2007 Free -dnl Software Foundation, Inc. +dnl Copyright (C) 1998, 2001, 2003-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +14,7 @@ AC_DEFUN([gl_FUNC_LCHOWN], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_CHOWN]) - AC_REPLACE_FUNCS(lchown) + AC_REPLACE_FUNCS([lchown]) if test $ac_cv_func_lchown = no; then REPLACE_LCHOWN=1 fi diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 96c4e2c..e4863f2 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ dnl with libtool.m4. dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], [# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 conftest.sh . ./conftest.sh @@ -131,7 +131,7 @@ AC_DEFUN([AC_LIB_RPATH], acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) @@ -446,12 +446,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIB[]NAME[]_PREFIX="$basedir" + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi 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" + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index b2b7733..e960104 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ -# localcharset.m4 serial 5 -dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. +# localcharset.m4 serial 6 +dnl Copyright (C) 2002, 2004, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,7 +8,7 @@ AC_DEFUN([gl_LOCALCHARSET], [ dnl Prerequisites of lib/localcharset.c. AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CHECK_DECLS_ONCE(getc_unlocked) + AC_CHECK_DECLS_ONCE([getc_unlocked]) dnl Prerequisites of the lib/Makefile.am snippet. AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 new file mode 100644 index 0000000..653a5bc --- /dev/null +++ b/m4/locale-fr.m4 @@ -0,0 +1,185 @@ +# locale-fr.m4 serial 11 +dnl Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc. +dnl This file is free software; the Free 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. + +dnl Determine the name of a french locale with traditional encoding. +AC_DEFUN([gt_LOCALE_FR], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AM_LANGINFO_CODESET]) + AC_CACHE_CHECK([for a traditional french locale], [gt_cv_locale_fr], [ + AC_LANG_CONFTEST([AC_LANG_SOURCE([ +changequote(,)dnl +#include +#include +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () { + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +#if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +#endif +#ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +#endif + /* Check whether in the abbreviation of the second month, the second + character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only + one byte long. This excludes the UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1; + /* Check whether the decimal separator is a comma. + On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point + are nl_langinfo(RADIXCHAR) are both ".". */ + if (localeconv () ->decimal_point[0] != ',') return 1; + return 0; +} +changequote([,])dnl + ])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO-8859-1 + else + # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name. + if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.ISO8859-1 + else + # Test for the HP-UX locale name. + if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr_FR.iso88591 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr=fr + else + # None found. + gt_cv_locale_fr=none + fi + fi + fi + fi + fi + fi + rm -fr conftest* + ]) + LOCALE_FR=$gt_cv_locale_fr + AC_SUBST([LOCALE_FR]) +]) + +dnl Determine the name of a french locale with UTF-8 encoding. +AC_DEFUN([gt_LOCALE_FR_UTF8], +[ + AC_REQUIRE([AM_LANGINFO_CODESET]) + AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [ + AC_LANG_CONFTEST([AC_LANG_SOURCE([ +changequote(,)dnl +#include +#include +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () { + /* On BeOS and Haiku, locales are not implemented in libc. Rather, libintl + imitates locale dependent behaviour by looking at the environment + variables, and all locales use the UTF-8 encoding. */ +#if !(defined __BEOS__ || defined __HAIKU__) + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +# if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +# endif +# ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +# endif + /* Check whether in the abbreviation of the second month, the second + character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is + two bytes long, with UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%b", &t) < 4 + || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v') + return 1; +#endif + /* Check whether the decimal separator is a comma. + On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point + are nl_langinfo(RADIXCHAR) are both ".". */ + if (localeconv () ->decimal_point[0] != ',') return 1; + return 0; +} +changequote([,])dnl + ])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the usual locale name. + if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr_FR.UTF-8 + else + # Test for the Solaris 7 locale name. + if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_fr_utf8=fr.UTF-8 + else + # None found. + gt_cv_locale_fr_utf8=none + fi + fi + fi + fi + rm -fr conftest* + ]) + LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8 + AC_SUBST([LOCALE_FR_UTF8]) +]) diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 new file mode 100644 index 0000000..9360576 --- /dev/null +++ b/m4/locale-ja.m4 @@ -0,0 +1,107 @@ +# locale-ja.m4 serial 7 +dnl Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc. +dnl This file is free software; the Free 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. + +dnl Determine the name of a japanese locale with EUC-JP encoding. +AC_DEFUN([gt_LOCALE_JA], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AM_LANGINFO_CODESET]) + AC_CACHE_CHECK([for a traditional japanese locale], [gt_cv_locale_ja], [ + AC_LANG_CONFTEST([AC_LANG_SOURCE([ +changequote(,)dnl +#include +#include +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () +{ + const char *p; + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +#if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +#endif +#ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +#endif + /* Check whether MB_CUR_MAX is > 1. This excludes the dysfunctional locales + on Cygwin 1.5.x. */ + if (MB_CUR_MAX == 1) + return 1; + /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. + This excludes the UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; + for (p = buf; *p != '\0'; p++) + if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) + return 1; + return 0; +} +changequote([,])dnl + ])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the AIX locale name. + if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC-JP + else + # Test for the HP-UX, OSF/1, NetBSD locale name. + if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.eucJP + else + # Test for the IRIX, FreeBSD locale name. + if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja_JP.EUC + else + # Test for the Solaris 7 locale name. + if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_ja=ja + else + # Special test for NetBSD 1.6. + if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then + gt_cv_locale_ja=ja_JP.eucJP + else + # None found. + gt_cv_locale_ja=none + fi + fi + fi + fi + fi + fi + fi + rm -fr conftest* + ]) + LOCALE_JA=$gt_cv_locale_ja + AC_SUBST([LOCALE_JA]) +]) diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 new file mode 100644 index 0000000..36a5f1d --- /dev/null +++ b/m4/locale-zh.m4 @@ -0,0 +1,92 @@ +# locale-zh.m4 serial 6 +dnl Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc. +dnl This file is free software; the Free 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. + +dnl Determine the name of a chinese locale with GB18030 encoding. +AC_DEFUN([gt_LOCALE_ZH_CN], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AM_LANGINFO_CODESET]) + AC_CACHE_CHECK([for a transitional chinese locale], [gt_cv_locale_zh_CN], [ + AC_LANG_CONFTEST([AC_LANG_SOURCE([ +changequote(,)dnl +#include +#include +#include +#if HAVE_LANGINFO_CODESET +# include +#endif +#include +#include +struct tm t; +char buf[16]; +int main () +{ + const char *p; + /* Check whether the given locale name is recognized by the system. */ + if (setlocale (LC_ALL, "") == NULL) return 1; + /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". + On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET) + is empty, and the behaviour of Tcl 8.4 in this locale is not useful. + On OpenBSD 4.0, when an unsupported locale is specified, setlocale() + succeeds but then nl_langinfo(CODESET) is "646". In this situation, + some unit tests fail. */ +#if HAVE_LANGINFO_CODESET + { + const char *cs = nl_langinfo (CODESET); + if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0) + return 1; + } +#endif +#ifdef __CYGWIN__ + /* On Cygwin, avoid locale names without encoding suffix, because the + locale_charset() function relies on the encoding suffix. Note that + LC_ALL is set on the command line. */ + if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; +#endif + /* Check whether in a month name, no byte in the range 0x80..0x9F occurs. + This excludes the UTF-8 encoding. */ + t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4; + if (strftime (buf, sizeof (buf), "%B", &t) < 2) return 1; + for (p = buf; *p != '\0'; p++) + if ((unsigned char) *p >= 0x80 && (unsigned char) *p < 0xa0) + return 1; + /* Check whether a typical GB18030 multibyte sequence is recognized as a + single wide character. This excludes the GB2312 and GBK encodings. */ + if (mblen ("\203\062\332\066", 5) != 4) + return 1; + return 0; +} +changequote([,])dnl + ])]) + if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then + # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because + # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the + # configure script would override the LC_ALL setting. Likewise for + # LC_CTYPE, which is also set at the beginning of the configure script. + # Test for the locale name without encoding suffix. + if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN + else + # Test for the locale name with explicit encoding suffix. + if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then + gt_cv_locale_zh_CN=zh_CN.GB18030 + else + # None found. + gt_cv_locale_zh_CN=none + fi + fi + else + # If there was a link error, due to mblen(), the system is so old that + # it certainly doesn't have a chinese locale. + gt_cv_locale_zh_CN=none + fi + rm -fr conftest* + ]) + LOCALE_ZH_CN=$gt_cv_locale_zh_CN + AC_SUBST([LOCALE_ZH_CN]) +]) diff --git a/m4/longlong.m4 b/m4/longlong.m4 index 15bf9da..eedc8d5 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ -# longlong.m4 serial 13 -dnl Copyright (C) 1999-2007 Free Software Foundation, Inc. +# longlong.m4 serial 14 +dnl Copyright (C) 1999-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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([AC_TYPE_LONG_LONG_INT], [ac_cv_type_long_long_int=yes])], [ac_cv_type_long_long_int=no])]) if test $ac_cv_type_long_long_int = yes; then - AC_DEFINE([HAVE_LONG_LONG_INT], 1, + AC_DEFINE([HAVE_LONG_LONG_INT], [1], [Define to 1 if the system has the type `long long int'.]) fi ]) @@ -69,7 +69,7 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], [ac_cv_type_unsigned_long_long_int=yes], [ac_cv_type_unsigned_long_long_int=no])]) if test $ac_cv_type_unsigned_long_long_int = yes; then - AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], [Define to 1 if the system has the type `unsigned long long int'.]) fi ]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 9ac109f..74c78fe 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,7 +1,6 @@ -#serial 17 +# serial 19 -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,12 +11,16 @@ 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 + dnl If lstat does not exist, the replacement does + dnl "#define lstat stat", and lstat.c does not need to be compiled. + AC_CHECK_FUNCS_ONCE([lstat]) + if test $ac_cv_func_lstat = yes; then + 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]) fi - # Prerequisites of lib/lstat.c. - AC_REQUIRE([AC_C_INLINE]) - : ]) diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 764f2a9..8070171 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ -# malloc.m4 serial 8 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# malloc.m4 serial 9 +dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MALLOC_POSIX], AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) if test $gl_cv_func_malloc_posix = yes; then HAVE_MALLOC_POSIX=1 - AC_DEFINE([HAVE_MALLOC_POSIX], 1, + AC_DEFINE([HAVE_MALLOC_POSIX], [1], [Define if the 'malloc' function is POSIX compliant.]) else AC_LIBOBJ([malloc]) diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 7d51af1..88ba569 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ -# mbiter.m4 serial 2 -dnl Copyright (C) 2005 Free Software Foundation, Inc. +# mbiter.m4 serial 4 +dnl Copyright (C) 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. @@ -11,7 +11,7 @@ AC_DEFUN([gl_MBITER], [ AC_REQUIRE([AC_TYPE_MBSTATE_T]) dnl The following line is that so the user can test HAVE_MBRTOWC before - dnl #include "mbiter.h" or "mbuiter.h". - AC_REQUIRE([gl_FUNC_MBRTOWC]) + dnl #include "mbiter.h" or "mbuiter.h". It can be removed in 2010. + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index a3bd911..726497b 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,15 +1,308 @@ -# mbrtowc.m4 serial 8 -dnl Copyright (C) 2001-2002, 2004-2005 Free Software Foundation, Inc. +# mbrtowc.m4 serial 13 +dnl Copyright (C) 2001-2002, 2004-2005, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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_MBRTOWC], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + + AC_REQUIRE([AC_TYPE_MBSTATE_T]) + gl_MBSTATE_T_BROKEN + if test $REPLACE_MBSTATE_T = 1; then + REPLACE_MBRTOWC=1 + fi + AC_CHECK_FUNCS_ONCE([mbrtowc]) + if test $ac_cv_func_mbrtowc = no; then + HAVE_MBRTOWC=0 + fi + if test $HAVE_MBRTOWC != 0 && test $REPLACE_MBRTOWC != 1; then + gl_MBRTOWC_NULL_ARG + gl_MBRTOWC_RETVAL + gl_MBRTOWC_NUL_RETVAL + case "$gl_cv_func_mbrtowc_null_arg" in + *yes) ;; + *) AC_DEFINE([MBRTOWC_NULL_ARG_BUG], [1], + [Define if the mbrtowc function has the NULL string argument bug.]) + REPLACE_MBRTOWC=1 + ;; + esac + case "$gl_cv_func_mbrtowc_retval" in + *yes) ;; + *) AC_DEFINE([MBRTOWC_RETVAL_BUG], [1], + [Define if the mbrtowc function returns a wrong return value.]) + REPLACE_MBRTOWC=1 + ;; + esac + case "$gl_cv_func_mbrtowc_nul_retval" in + *yes) ;; + *) AC_DEFINE([MBRTOWC_NUL_RETVAL_BUG], [1], + [Define if the mbrtowc function does not return 0 for a NUL character.]) + REPLACE_MBRTOWC=1 + ;; + esac + fi + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + gl_REPLACE_WCHAR_H + AC_LIBOBJ([mbrtowc]) + gl_PREREQ_MBRTOWC + fi +]) + +dnl Test whether mbsinit() and mbrtowc() need to be overridden in a way that +dnl redefines the semantics of the given mbstate_t type. +dnl Result is REPLACE_MBSTATE_T. +dnl When this is set to 1, we replace both mbsinit() and mbrtowc(), in order to +dnl avoid inconsistencies. + +AC_DEFUN([gl_MBSTATE_T_BROKEN], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + + AC_REQUIRE([AC_TYPE_MBSTATE_T]) + AC_CHECK_FUNCS_ONCE([mbsinit]) + AC_CHECK_FUNCS_ONCE([mbrtowc]) + if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then + gl_MBRTOWC_INCOMPLETE_STATE + case "$gl_cv_func_mbrtowc_incomplete_state" in + *yes) REPLACE_MBSTATE_T=0 ;; + *) REPLACE_MBSTATE_T=1 ;; + esac + else + REPLACE_MBSTATE_T=1 + fi + if test $REPLACE_MBSTATE_T = 1; then + gl_REPLACE_WCHAR_H + fi +]) + +dnl Test whether mbrtowc puts the state into non-initial state when parsing an +dnl incomplete multibyte character. +dnl Result is gl_cv_func_mbrtowc_incomplete_state. + +AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_JA]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc handles incomplete characters], + [gl_cv_func_mbrtowc_incomplete_state], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on AIX and OSF/1. + osf*) gl_cv_func_mbrtowc_incomplete_state="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_incomplete_state="guessing yes" ;; + esac +changequote([,])dnl + if test $LOCALE_JA != none; then + AC_TRY_RUN([ +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + const char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + if (mbsinit (&state)) + return 1; + } + return 0; +}], + [gl_cv_func_mbrtowc_incomplete_state=yes], + [gl_cv_func_mbrtowc_incomplete_state=no], + []) + fi + ]) +]) + +dnl Test whether mbrtowc supports a NULL string argument correctly. +dnl Result is gl_cv_func_mbrtowc_null_arg. + +AC_DEFUN([gl_MBRTOWC_NULL_ARG], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_FR_UTF8]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument], + [gl_cv_func_mbrtowc_null_arg], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on OSF/1. + osf*) gl_cv_func_mbrtowc_null_arg="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_null_arg="guessing yes" ;; + esac +changequote([,])dnl + if test $LOCALE_FR_UTF8 != none; then + AC_TRY_RUN([ +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + mbstate_t state; + wchar_t wc; + int ret; + + memset (&state, '\0', sizeof (mbstate_t)); + wc = (wchar_t) 0xBADFACE; + mbrtowc (&wc, NULL, 5, &state); + /* Check that wc was not modified. */ + if (wc != (wchar_t) 0xBADFACE) + return 1; + } + return 0; +}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], []) + fi + ]) +]) + +dnl Test whether mbrtowc, when parsing the end of a multibyte character, +dnl correctly returns the number of bytes that were needed to complete the +dnl character (not the total number of bytes of the multibyte character). +dnl Result is gl_cv_func_mbrtowc_retval. + +AC_DEFUN([gl_MBRTOWC_RETVAL], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_FR_UTF8]) + AC_REQUIRE([gt_LOCALE_JA]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc has a correct return value], + [gl_cv_func_mbrtowc_retval], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on HP-UX and Solaris. + hpux* | solaris*) gl_cv_func_mbrtowc_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_retval="guessing yes" ;; + esac +changequote([,])dnl + if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then + AC_TRY_RUN([ +#include +#include +#include +int main () +{ + /* This fails on Solaris. */ + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + char input[] = "B\303\274\303\237er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + { + input[1] = '\0'; + if (mbrtowc (&wc, input + 2, 5, &state) != 1) + return 1; + } + } + /* This fails on HP-UX 11.11. */ + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */ + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) + { + input[1] = '\0'; + if (mbrtowc (&wc, input + 2, 5, &state) != 2) + return 1; + } + } + return 0; +}], + [gl_cv_func_mbrtowc_retval=yes], + [gl_cv_func_mbrtowc_retval=no], + []) + fi + ]) +]) + +dnl Test whether mbrtowc, when parsing a NUL character, correctly returns 0. +dnl Result is gl_cv_func_mbrtowc_nul_retval. + +AC_DEFUN([gl_MBRTOWC_NUL_RETVAL], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_ZH_CN]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether mbrtowc returns 0 when parsing a NUL character], + [gl_cv_func_mbrtowc_nul_retval], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on Solaris 9. + solaris2.9) gl_cv_func_mbrtowc_nul_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_mbrtowc_nul_retval="guessing yes" ;; + esac +changequote([,])dnl + if test $LOCALE_ZH_CN != none; then + AC_TRY_RUN([ +#include +#include +#include +int main () +{ + /* This fails on Solaris 9. */ + if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + { + mbstate_t state; + wchar_t wc; + + memset (&state, '\0', sizeof (mbstate_t)); + if (mbrtowc (&wc, "", 1, &state) != 0) + return 1; + } + return 0; +}], + [gl_cv_func_mbrtowc_nul_retval=yes], + [gl_cv_func_mbrtowc_nul_retval=no], + []) + fi + ]) +]) + +# Prerequisites of lib/mbrtowc.c. +AC_DEFUN([gl_PREREQ_MBRTOWC], [ + : +]) + + dnl From Paul Eggert -dnl This file can be removed, and gl_FUNC_MBRTOWC replaced with -dnl AC_FUNC_MBRTOWC, when autoconf 2.60 can be assumed everywhere. +dnl This override of an autoconf macro can be removed when autoconf 2.60 or +dnl newer can be assumed everywhere. -AC_DEFUN([gl_FUNC_MBRTOWC], +m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.60]),[-1],[ +AC_DEFUN([AC_FUNC_MBRTOWC], [ dnl Same as AC_FUNC_MBRTOWC in autoconf-2.60. AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared], @@ -25,7 +318,8 @@ AC_DEFUN([gl_FUNC_MBRTOWC], gl_cv_func_mbrtowc=yes, gl_cv_func_mbrtowc=no)]) if test $gl_cv_func_mbrtowc = yes; then - AC_DEFINE([HAVE_MBRTOWC], 1, + AC_DEFINE([HAVE_MBRTOWC], [1], [Define to 1 if mbrtowc and mbstate_t are properly declared.]) fi ]) +]) diff --git a/m4/mbscasecmp.m4 b/m4/mbscasecmp.m4 index 7357769..d76d10f 100644 --- a/m4/mbscasecmp.m4 +++ b/m4/mbscasecmp.m4 @@ -1,5 +1,5 @@ -# mbscasecmp.m4 serial 1 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# mbscasecmp.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. @@ -11,6 +11,6 @@ AC_DEFUN([gl_FUNC_MBSCASECMP], # Prerequisites of lib/mbscasecmp.c. AC_DEFUN([gl_PREREQ_MBSCASECMP], [ - AC_REQUIRE([gl_FUNC_MBRTOWC]) + AC_REQUIRE([AC_FUNC_MBRTOWC]) : ]) diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 new file mode 100644 index 0000000..03b055c --- /dev/null +++ b/m4/mbsinit.m4 @@ -0,0 +1,30 @@ +# mbsinit.m4 serial 3 +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_MBSINIT], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + + AC_REQUIRE([AC_TYPE_MBSTATE_T]) + gl_MBSTATE_T_BROKEN + if test $REPLACE_MBSTATE_T = 1; then + REPLACE_MBSINIT=1 + fi + AC_CHECK_FUNCS_ONCE([mbsinit]) + if test $ac_cv_func_mbsinit = no; then + HAVE_MBSINIT=0 + fi + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + gl_REPLACE_WCHAR_H + AC_LIBOBJ([mbsinit]) + gl_PREREQ_MBSINIT + fi +]) + +# Prerequisites of lib/mbsinit.c. +AC_DEFUN([gl_PREREQ_MBSINIT], [ + : +]) diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index 0da32b6..d4ec6f0 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ -# mbstate_t.m4 serial 10 -dnl Copyright (C) 2000-2002, 2008 Free Software Foundation, Inc. +# mbstate_t.m4 serial 12 +dnl Copyright (C) 2000-2002, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,10 @@ dnl with or without modifications, as long as this notice is preserved. # AC_TYPE_MBSTATE_T # ----------------- AC_DEFUN([AC_TYPE_MBSTATE_T], - [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, +[ + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl for HP-UX 11.11 + + AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT[ @@ -22,9 +25,10 @@ AC_DEFUN([AC_TYPE_MBSTATE_T], [ac_cv_type_mbstate_t=yes], [ac_cv_type_mbstate_t=no])]) if test $ac_cv_type_mbstate_t = yes; then - AC_DEFINE([HAVE_MBSTATE_T], 1, + AC_DEFINE([HAVE_MBSTATE_T], [1], [Define to 1 if declares mbstate_t.]) else - AC_DEFINE([mbstate_t], int, + AC_DEFINE([mbstate_t], [int], [Define to a type if does not define.]) - fi]) + fi +]) diff --git a/m4/memchr.m4 b/m4/memchr.m4 deleted file mode 100644 index 91b8636..0000000 --- a/m4/memchr.m4 +++ /dev/null @@ -1,18 +0,0 @@ -# memchr.m4 serial 4 -dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -dnl This file is free software; the Free 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_MEMCHR], -[ - AC_REPLACE_FUNCS(memchr) - if test $ac_cv_func_memchr = no; then - gl_PREREQ_MEMCHR - fi -]) - -# Prerequisites of lib/memchr.c. -AC_DEFUN([gl_PREREQ_MEMCHR], [ - AC_CHECK_HEADERS(bp-sym.h) -]) diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index d1a12eb..a3c022f 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,5 +1,5 @@ -# mempcpy.m4 serial 9 -dnl Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. +# mempcpy.m4 serial 10 +dnl Copyright (C) 2003-2004, 2006-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(mempcpy) + AC_REPLACE_FUNCS([mempcpy]) if test $ac_cv_func_mempcpy = no; then HAVE_MEMPCPY=0 gl_PREREQ_MEMPCPY diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index 8070d5f..b74de75 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,5 +1,5 @@ -# memrchr.m4 serial 8 -dnl Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# memrchr.m4 serial 9 +dnl Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_MEMRCHR], HAVE_DECL_MEMRCHR=0 fi - AC_REPLACE_FUNCS(memrchr) + AC_REPLACE_FUNCS([memrchr]) if test $ac_cv_func_memrchr = no; then gl_PREREQ_MEMRCHR fi diff --git a/m4/memset.m4 b/m4/memset.m4 deleted file mode 100644 index 14ac267..0000000 --- a/m4/memset.m4 +++ /dev/null @@ -1,18 +0,0 @@ -# memset.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software; the Free 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_MEMSET], -[ - AC_REPLACE_FUNCS(memset) - if test $ac_cv_func_memset = no; then - gl_PREREQ_MEMSET - fi -]) - -# Prerequisites of lib/memset.c. -AC_DEFUN([gl_PREREQ_MEMSET], [ - : -]) diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4 index 0eeafbc..444b618 100644 --- a/m4/mkdtemp.m4 +++ b/m4/mkdtemp.m4 @@ -1,5 +1,5 @@ -# mkdtemp.m4 serial 5 -dnl Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc. +# mkdtemp.m4 serial 6 +dnl Copyright (C) 2001-2003, 2006-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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([gt_FUNC_MKDTEMP], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REPLACE_FUNCS(mkdtemp) + AC_REPLACE_FUNCS([mkdtemp]) if test $ac_cv_func_mkdtemp = no; then HAVE_MKDTEMP=0 gl_PREREQ_MKDTEMP diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 5faf393..1e926e8 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ -#serial 13 -dnl Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# serial 15 +dnl Copyright (C) 2002-2003, 2005-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,9 +13,16 @@ dnl From Jim Meyering. # AC_FUNC_MKTIME # -------------- AC_DEFUN([AC_FUNC_MKTIME], -[AC_CHECK_HEADERS_ONCE(unistd.h) -AC_CHECK_FUNCS_ONCE(alarm) -AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, +[AC_CHECK_HEADERS_ONCE([unistd.h]) +AC_CHECK_FUNCS_ONCE([alarm]) +AC_REQUIRE([gl_MULTIARCH]) +if test $APPLE_UNIVERSAL_BUILD = 1; then + # A universal build on Apple MacOS X platforms. + # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. + # But we need a configuration result that is valid in both modes. + ac_cv_func_working_mktime=no +fi +AC_CACHE_CHECK([for working mktime], [ac_cv_func_working_mktime], [AC_RUN_IFELSE([AC_LANG_SOURCE( [[/* Test program from Paul Eggert and Tony Leneis. */ #include @@ -68,16 +75,14 @@ spring_forward_gap () } static int -mktime_test1 (now) - time_t now; +mktime_test1 (time_t now) { struct tm *lt; return ! (lt = localtime (&now)) || mktime (lt) == now; } static int -mktime_test (now) - time_t now; +mktime_test (time_t now) { return (mktime_test1 (now) && mktime_test1 ((time_t) (time_t_max - now)) @@ -101,8 +106,7 @@ irix_6_4_bug () } static int -bigtime_test (j) - int j; +bigtime_test (int j) { struct tm tm; time_t now; @@ -212,9 +216,9 @@ fi AC_DEFUN([gl_FUNC_MKTIME], [ AC_FUNC_MKTIME - dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ(mktime). + dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ([mktime]). if test $ac_cv_func_working_mktime = no; then - AC_DEFINE(mktime, rpl_mktime, + AC_DEFINE([mktime], [rpl_mktime], [Define to rpl_mktime if the replacement function should be used.]) gl_PREREQ_MKTIME fi diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 new file mode 100644 index 0000000..3948e6e --- /dev/null +++ b/m4/multiarch.m4 @@ -0,0 +1,66 @@ +# multiarch.m4 serial 4 +dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Determine whether the compiler is or may be producing universal binaries. +# +# On MacOS X 10.5 and later systems, the user can create libraries and +# 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" +# +# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the +# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. + +dnl This macro must pass through AC_REQUIRE (never directly invoke it). +AC_DEFUN_ONCE([gl_MULTIARCH], +[ + dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN. + gl_cv_c_multiarch=no + AC_COMPILE_IFELSE( + [AC_LANG_SOURCE( + [[#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; + ]])], + [ + dnl Check for potential -arch flags. It is not universal unless + dnl there are at least two -arch flags with different values. + arch= + prev= + for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do + if test -n "$prev"; then + case $word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$arch" || test "$arch" = "$word"; then + arch="$word" + else + gl_cv_c_multiarch=yes + fi + ;; + esac + prev= + else + if test "x$word" = "x-arch"; then + prev=arch + fi + fi + done + ]) + if test $gl_cv_c_multiarch = yes; then + AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1], + [Define if the compiler is building for multiple architectures of Apple platforms at once.]) + APPLE_UNIVERSAL_BUILD=1 + else + APPLE_UNIVERSAL_BUILD=0 + fi + AC_SUBST([APPLE_UNIVERSAL_BUILD]) +]) diff --git a/m4/nls.m4 b/m4/nls.m4 index 7967cc2..0b36434 100644 --- a/m4/nls.m4 +++ b/m4/nls.m4 @@ -1,5 +1,5 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +17,15 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff --git a/m4/open.m4 b/m4/open.m4 index 38dfa26..6e286c9 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ -# open.m4 serial 4 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# open.m4 serial 5 +dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -39,7 +39,7 @@ changequote([,])dnl ]) case "$gl_cv_func_open_slash" in *no) - AC_DEFINE([OPEN_TRAILING_SLASH_BUG], 1, + AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1], [Define to 1 if open() fails to recognize a trailing slash.]) gl_REPLACE_OPEN ;; diff --git a/m4/openat.m4 b/m4/openat.m4 index 3b5b7ca..10eac5c 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ -#serial 16 +# serial 17 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -79,8 +79,8 @@ AC_DEFUN([gl_FUNC_FCHOWNAT], fi if test $use_replacement_fchownat = yes; then - AC_LIBOBJ(fchownat) - AC_DEFINE(fchownat, rpl_fchownat, + AC_LIBOBJ([fchownat]) + AC_DEFINE([fchownat], [rpl_fchownat], [Define to rpl_fchownat if the replacement function should be used.]) fi ]) diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 64bf26f..e88fdb4 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ -# pathmax.m4 serial 6 -dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# pathmax.m4 serial 7 +dnl Copyright (C) 2002, 2003, 2005, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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,5 +7,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_PATHMAX], [ dnl Prerequisites of lib/pathmax.h. - AC_CHECK_HEADERS_ONCE(sys/param.h) + AC_CHECK_HEADERS_ONCE([sys/param.h]) ]) diff --git a/m4/po.m4 b/m4/po.m4 index 0734762..2284fa5 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 15 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], @@ -41,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl diff --git a/m4/printf.m4 b/m4/printf.m4 index d544edd..a1d4dad 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 23 -dnl Copyright (C) 2003, 2007-2008 Free Software Foundation, Inc. +# printf.m4 serial 28 +dnl Copyright (C) 2003, 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -225,12 +225,12 @@ 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([gl_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, + 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 @@ -811,12 +811,15 @@ dnl Result is gl_cv_func_printf_enomem. AC_DEFUN([gl_PRINTF_ENOMEM], [ AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gl_MULTIARCH]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether printf survives out-of-memory conditions], [gl_cv_func_printf_enomem], [ + gl_cv_func_printf_enomem="guessing no" if test "$cross_compiling" = no; then - AC_LANG_CONFTEST([AC_LANG_SOURCE([ + if test $APPLE_UNIVERSAL_BUILD = 0; then + AC_LANG_CONFTEST([AC_LANG_SOURCE([ ]GL_NOCRASH[ changequote(,)dnl #include @@ -865,22 +868,29 @@ int main() } 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 + 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 + dnl A universal build on Apple MacOS X platforms. + dnl The result would be 'no' in 32-bit mode and 'yes' in 64-bit mode. + dnl But we need a configuration result that is valid in both modes. gl_cv_func_printf_enomem="guessing no" fi - rm -fr conftest* - else + fi + if test "$gl_cv_func_printf_enomem" = "guessing no"; then changequote(,)dnl case "$host_os" in # Guess yes on glibc systems. @@ -901,6 +911,8 @@ changequote(,)dnl osf*) gl_cv_func_printf_enomem="guessing yes";; # Guess yes on BeOS. beos*) gl_cv_func_printf_enomem="guessing yes";; + # Guess yes on Haiku. + haiku*) gl_cv_func_printf_enomem="guessing yes";; # If we don't know, assume the worst. *) gl_cv_func_printf_enomem="guessing no";; esac @@ -1130,7 +1142,7 @@ AC_DEFUN([gl_SNPRINTF_SIZE1], #include int main() { - static char buf[8] = "DEADBEEF"; + static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' }; snprintf (buf, 1, "%d", 12345); return buf[1] != 'E'; }], @@ -1148,7 +1160,7 @@ dnl --------------------------------------------------------------------- dnl #include dnl int main() dnl { -dnl static char buf[8] = "DEADBEEF"; +dnl static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' }; dnl snprintf (buf, 0, "%d", 12345); dnl return buf[0] != 'D'; dnl } @@ -1169,7 +1181,7 @@ dnl return ret; dnl } dnl int main() dnl { -dnl static char buf[8] = "DEADBEEF"; +dnl static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' }; dnl my_snprintf (buf, 0, "%d", 12345); dnl return buf[0] != 'D'; dnl } @@ -1197,7 +1209,7 @@ static int my_snprintf (char *buf, int size, const char *format, ...) } int main() { - static char buf[8] = "DEADBEEF"; + static char buf[8] = { 'D', 'E', 'A', 'D', 'B', 'E', 'E', 'F' }; my_snprintf (buf, 0, "%d", 12345); return buf[0] != 'D'; }], @@ -1305,5 +1317,6 @@ dnl OSF/1 5.1 # . # # # # . . . . # . . . . dnl OSF/1 4.0d # . # # # # . . . . # . . # # # # # # dnl NetBSD 4.0 . ? ? ? ? ? . . ? ? ? ? ? . . . ? ? ? dnl NetBSD 3.0 . . . . # # . # # ? # . # . . . . . . +dnl Haiku . . . # # # . . . . . . ? . . . . . . dnl BeOS # # . # # # . # . ? . # ? . . . . . . dnl mingw # # # # # # . # # . # # ? . # # # . . diff --git a/m4/progtest.m4 b/m4/progtest.m4 index a56365c..e1d445d 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. +# progtest.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2005, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper , 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -55,7 +55,7 @@ rm -f conf$$.file # Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff --git a/m4/quotearg.m4 b/m4/quotearg.m4 index db635d0..8847861 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ -# quotearg.m4 serial 6 -dnl Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# quotearg.m4 serial 7 +dnl Copyright (C) 2002, 2004-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. @@ -11,5 +11,5 @@ AC_DEFUN([gl_QUOTEARG], dnl Prerequisites of lib/quotearg.c. AC_CHECK_FUNCS_ONCE([mbsinit]) AC_TYPE_MBSTATE_T - gl_FUNC_MBRTOWC + AC_FUNC_MBRTOWC ]) diff --git a/m4/readlink.m4 b/m4/readlink.m4 index 1c347a0..ff3f1f5 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ -# readlink.m4 serial 4 -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# readlink.m4 serial 5 +dnl Copyright (C) 2003, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_READLINK], AC_CHECK_FUNCS_ONCE([readlink]) if test $ac_cv_func_readlink = no; then HAVE_READLINK=0 - AC_LIBOBJ(readlink) + AC_LIBOBJ([readlink]) gl_PREREQ_READLINK fi ]) diff --git a/m4/realloc.m4 b/m4/realloc.m4 index f9fd935..5925796 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ -# realloc.m4 serial 8 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# realloc.m4 serial 9 +dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_REALLOC_POSIX], AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) if test $gl_cv_func_malloc_posix = yes; then HAVE_REALLOC_POSIX=1 - AC_DEFINE([HAVE_REALLOC_POSIX], 1, + AC_DEFINE([HAVE_REALLOC_POSIX], [1], [Define if the 'realloc' function is POSIX compliant.]) else AC_LIBOBJ([realloc]) diff --git a/m4/regex.m4 b/m4/regex.m4 index 38fb7ba..43b0463 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,7 +1,7 @@ -#serial 52 +# serial 53 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -175,7 +175,7 @@ AC_DEFUN([gl_REGEX], esac if test $ac_use_included_regex = yes; then - AC_DEFINE([_REGEX_LARGE_OFFSETS], 1, + AC_DEFINE([_REGEX_LARGE_OFFSETS], [1], [Define if you want regoff_t to be at least as wide POSIX requires.]) AC_DEFINE([re_syntax_options], [rpl_re_syntax_options], [Define to rpl_re_syntax_options if the replacement should be used.]) @@ -219,6 +219,6 @@ AC_DEFUN([gl_PREREQ_REGEX], 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_FUNCS_ONCE([isblank iswctype wcscoll]) AC_CHECK_DECLS([isblank], [], [], [#include ]) ]) diff --git a/m4/rmdir.m4 b/m4/rmdir.m4 deleted file mode 100644 index 7235203..0000000 --- a/m4/rmdir.m4 +++ /dev/null @@ -1,10 +0,0 @@ -# rmdir.m4 serial 3 -dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc. -dnl This file is free software; the Free 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_RMDIR], -[ - AC_REPLACE_FUNCS(rmdir) -]) diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index e4c986d..387deff 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ -# rpmatch.m4 serial 7 -dnl Copyright (C) 2002-2003, 2007-2008 Free Software Foundation, Inc. +# rpmatch.m4 serial 8 +dnl Copyright (C) 2002-2003, 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_RPMATCH], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REPLACE_FUNCS(rpmatch) + AC_REPLACE_FUNCS([rpmatch]) if test $ac_cv_func_rpmatch = no; then HAVE_RPMATCH=0 gl_PREREQ_RPMATCH @@ -19,14 +19,14 @@ AC_DEFUN([gl_FUNC_RPMATCH], # Prerequisites of lib/rpmatch.c. AC_DEFUN([gl_PREREQ_RPMATCH], [ - AC_CACHE_CHECK([for nl_langinfo and YESEXPR], gl_cv_langinfo_yesexpr, + 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, + AC_DEFINE([HAVE_LANGINFO_YESEXPR], [1], [Define if you have and nl_langinfo(YESEXPR).]) fi ]) diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4 index 7a2286b..c9b3a3b 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,5 +1,5 @@ -#serial 8 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# serial 9 +dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,5 +8,5 @@ AC_DEFUN([gl_SAVE_CWD], [ AC_LIBOBJ([save-cwd]) dnl Prerequisites for lib/save-cwd.c. - AC_CHECK_FUNCS_ONCE(fchdir) + AC_CHECK_FUNCS_ONCE([fchdir]) ]) diff --git a/m4/setenv.m4 b/m4/setenv.m4 index 7af13d7..e28407e 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ -# setenv.m4 serial 10 -dnl Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc. +# setenv.m4 serial 11 +dnl Copyright (C) 2001-2004, 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,7 +35,7 @@ AC_DEFUN([gl_FUNC_UNSETENV], AC_LIBOBJ([unsetenv]) gl_PREREQ_UNSETENV else - AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret, + AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret], [AC_TRY_COMPILE([#include extern #ifdef __cplusplus @@ -58,14 +58,14 @@ AC_DEFUN([gl_PREREQ_SETENV], [ AC_REQUIRE([AC_FUNC_ALLOCA]) AC_REQUIRE([gl_ENVIRON]) - AC_CHECK_HEADERS_ONCE(unistd.h) - AC_CHECK_HEADERS(search.h) - AC_CHECK_FUNCS(tsearch) + AC_CHECK_HEADERS_ONCE([unistd.h]) + AC_CHECK_HEADERS([search.h]) + AC_CHECK_FUNCS([tsearch]) ]) # Prerequisites of lib/unsetenv.c. AC_DEFUN([gl_PREREQ_UNSETENV], [ AC_REQUIRE([gl_ENVIRON]) - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) ]) diff --git a/m4/size_max.m4 b/m4/size_max.m4 new file mode 100644 index 0000000..e0e7b3f --- /dev/null +++ b/m4/size_max.m4 @@ -0,0 +1,68 @@ +# size_max.m4 serial 7 +dnl Copyright (C) 2003, 2005-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 From Bruno Haible. + +AC_DEFUN([gl_SIZE_MAX], +[ + AC_CHECK_HEADERS([stdint.h]) + dnl First test whether the system already has SIZE_MAX. + AC_MSG_CHECKING([for SIZE_MAX]) + AC_CACHE_VAL([gl_cv_size_max], [ + gl_cv_size_max= + AC_EGREP_CPP([Found it], [ +#include +#if HAVE_STDINT_H +#include +#endif +#ifdef SIZE_MAX +Found it +#endif +], [gl_cv_size_max=yes]) + if test -z "$gl_cv_size_max"; then + dnl Define it ourselves. Here we assume that the type 'size_t' is not wider + dnl than the type 'unsigned long'. Try hard to find a definition that can + dnl be used in a preprocessor #if, i.e. doesn't contain a cast. + AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1], + [#include +#include ], [size_t_bits_minus_1=]) + AC_COMPUTE_INT([fits_in_uint], [sizeof (size_t) <= sizeof (unsigned int)], + [#include ], [fits_in_uint=]) + if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then + if test $fits_in_uint = 1; then + dnl Even though SIZE_MAX fits in an unsigned int, it must be of type + dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. + AC_TRY_COMPILE([#include + extern size_t foo; + extern unsigned long foo; + ], [], [fits_in_uint=0]) + fi + dnl We cannot use 'expr' to simplify this expression, because 'expr' + dnl works only with 'long' integers in the host environment, while we + dnl might be cross-compiling from a 32-bit platform to a 64-bit platform. + 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 + dnl Shouldn't happen, but who knows... + gl_cv_size_max='((size_t)~(size_t)0)' + fi + fi + ]) + AC_MSG_RESULT([$gl_cv_size_max]) + if test "$gl_cv_size_max" != yes; then + AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max], + [Define as the maximum value of type 'size_t', if the system doesn't define it.]) + 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/stat-time.m4 b/m4/stat-time.m4 index 84dc26f..b860be8 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998, 1999, 2001, 2003, 2005, 2006, 2007 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -43,7 +43,7 @@ AC_DEFUN([gl_STAT_TIME], [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes], [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no])]) if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then - AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], 1, + AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], [1], [Define to 1 if the type of the st_atim member of a struct stat is struct timespec.]) fi], diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index 2204ecd..57c804a 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -111,5 +111,5 @@ AC_DEFUN([AC_HEADER_STDBOOL], [ac_cv_header_stdbool_h=no])]) AC_CHECK_TYPES([_Bool]) if test $ac_cv_header_stdbool_h = yes; then - AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) + AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.]) fi]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index b255692..b4194c8 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 31 -dnl Copyright (C) 2001-2008 Free Software Foundation, Inc. +# stdint.m4 serial 33 +dnl Copyright (C) 2001-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ dnl Test whether is supported or must be substituted. AC_DEFUN([gl_STDINT_H], [ - AC_PREREQ(2.59)dnl + AC_PREREQ([2.59])dnl dnl Check for long long int and unsigned long long int. AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) @@ -229,7 +229,7 @@ struct s { gl_STDINT_TYPE_PROPERTIES STDINT_H=stdint.h fi - AC_SUBST(STDINT_H) + AC_SUBST([STDINT_H]) ]) dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES) @@ -292,7 +292,7 @@ AC_DEFUN([gl_CHECK_TYPES_SIGNED], eval result=\$gl_cv_type_${gltype}_signed GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` if test "$result" = yes; then - AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], 1) + AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1]) eval HAVE_SIGNED_${GLTYPE}=1 else eval HAVE_SIGNED_${GLTYPE}=0 @@ -348,7 +348,7 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], eval result=\$gl_cv_type_${gltype}_suffix test "$result" = no && result= eval ${GLTYPE}_SUFFIX=\$result - AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], $result) + AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result]) done m4_foreach_w([gltype], [$1], [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])]) @@ -373,13 +373,22 @@ dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t dnl of interest to stdint.in.h. AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], [ - gl_STDINT_BITSIZEOF([ptrdiff_t sig_atomic_t size_t wchar_t wint_t], + AC_REQUIRE([gl_MULTIARCH]) + if test $APPLE_UNIVERSAL_BUILD = 0; then + gl_STDINT_BITSIZEOF([ptrdiff_t size_t], + [gl_STDINT_INCLUDES]) + fi + gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t], [gl_STDINT_INCLUDES]) gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t], [gl_STDINT_INCLUDES]) gl_cv_type_ptrdiff_t_signed=yes gl_cv_type_size_t_signed=no - gl_INTEGER_TYPE_SUFFIX([ptrdiff_t sig_atomic_t size_t wchar_t wint_t], + if test $APPLE_UNIVERSAL_BUILD = 0; then + gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t], + [gl_STDINT_INCLUDES]) + fi + gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t], [gl_STDINT_INCLUDES]) ]) diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index db9a8ac..82f0c24 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ -# stdint_h.m4 serial 6 -dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. +# stdint_h.m4 serial 8 +dnl Copyright (C) 1997-2004, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,15 +11,15 @@ dnl From Paul Eggert. AC_DEFUN([gl_AC_HEADER_STDINT_H], [ - AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, + AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h], [AC_TRY_COMPILE( [#include #include ], [uintmax_t i = (uintmax_t) -1; return !i;], - gl_cv_header_stdint_h=yes, - gl_cv_header_stdint_h=no)]) + [gl_cv_header_stdint_h=yes], + [gl_cv_header_stdint_h=no])]) if test $gl_cv_header_stdint_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, + AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1], [Define if exists, doesn't clash with , and declares uintmax_t. ]) fi diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 60b4bd7..846b65d 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 14 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# stdio_h.m4 serial 15 +dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -53,6 +53,8 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], 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_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF]) + GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF]) 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]) @@ -86,6 +88,10 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], HAVE_DECL_VSNPRINTF=1; AC_SUBST([HAVE_DECL_VSNPRINTF]) REPLACE_SPRINTF=0; AC_SUBST([REPLACE_SPRINTF]) REPLACE_VSPRINTF=0; AC_SUBST([REPLACE_VSPRINTF]) + HAVE_DPRINTF=1; AC_SUBST([HAVE_DPRINTF]) + REPLACE_DPRINTF=0; AC_SUBST([REPLACE_DPRINTF]) + HAVE_VDPRINTF=1; AC_SUBST([HAVE_VDPRINTF]) + REPLACE_VDPRINTF=0; AC_SUBST([REPLACE_VDPRINTF]) 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]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 582db13..515befe 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 13 -dnl Copyright (C) 2007, 2008 Free Software Foundation, Inc. +# stdlib_h.m4 serial 14 +dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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,9 +8,20 @@ AC_DEFUN([gl_STDLIB_H], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([stdlib.h]) + AC_CHECK_HEADERS([random.h]) + if test $ac_cv_header_random_h = yes; then + HAVE_RANDOM_H=1 + else + HAVE_RANDOM_H=0 + fi + AC_SUBST([HAVE_RANDOM_H]) AC_CHECK_TYPES([struct random_data], [], [HAVE_STRUCT_RANDOM_DATA=0], - [[#include ]]) + [[#include + #if HAVE_RANDOM_H + # include + #endif + ]]) ]) AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index c38f40e..96de867 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ -# stpcpy.m4 serial 6 -dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. +# stpcpy.m4 serial 7 +dnl Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_STPCPY], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(stpcpy) + AC_REPLACE_FUNCS([stpcpy]) if test $ac_cv_func_stpcpy = no; then HAVE_STPCPY=0 gl_PREREQ_STPCPY diff --git a/m4/strcase.m4 b/m4/strcase.m4 index 79c525c..0dfdb1a 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,5 +1,5 @@ -# strcase.m4 serial 9 -dnl Copyright (C) 2002, 2005-2008 Free Software Foundation, Inc. +# strcase.m4 serial 10 +dnl Copyright (C) 2002, 2005-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,7 +13,7 @@ AC_DEFUN([gl_STRCASE], AC_DEFUN([gl_FUNC_STRCASECMP], [ AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - AC_REPLACE_FUNCS(strcasecmp) + AC_REPLACE_FUNCS([strcasecmp]) if test $ac_cv_func_strcasecmp = no; then HAVE_STRCASECMP=0 gl_PREREQ_STRCASECMP @@ -23,11 +23,11 @@ AC_DEFUN([gl_FUNC_STRCASECMP], AC_DEFUN([gl_FUNC_STRNCASECMP], [ AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - AC_REPLACE_FUNCS(strncasecmp) + AC_REPLACE_FUNCS([strncasecmp]) if test $ac_cv_func_strncasecmp = no; then gl_PREREQ_STRNCASECMP fi - AC_CHECK_DECLS(strncasecmp) + AC_CHECK_DECLS([strncasecmp]) if test $ac_cv_have_decl_strncasecmp = no; then HAVE_DECL_STRNCASECMP=0 fi diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index 7c1273a..7e270d0 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,5 +1,5 @@ -# strchrnul.m4 serial 6 -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# strchrnul.m4 serial 7 +dnl Copyright (C) 2003, 2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRCHRNUL], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strchrnul) + AC_REPLACE_FUNCS([strchrnul]) if test $ac_cv_func_strchrnul = no; then HAVE_STRCHRNUL=0 gl_PREREQ_STRCHRNUL diff --git a/m4/strdup.m4 b/m4/strdup.m4 index 0537def..d7daac2 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ -# strdup.m4 serial 10 +# strdup.m4 serial 11 -dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,8 +9,8 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRDUP], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strdup) - AC_CHECK_DECLS_ONCE(strdup) + AC_REPLACE_FUNCS([strdup]) + AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 fi @@ -25,9 +25,9 @@ AC_DEFUN([gl_FUNC_STRDUP_POSIX], REPLACE_STRDUP=1 AC_LIBOBJ([strdup]) else - AC_REPLACE_FUNCS(strdup) + AC_REPLACE_FUNCS([strdup]) fi - AC_CHECK_DECLS_ONCE(strdup) + AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 fi diff --git a/m4/strndup.m4 b/m4/strndup.m4 index 1be2a85..4fa7d5a 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ -# strndup.m4 serial 15 -dnl Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc. +# strndup.m4 serial 16 +dnl Copyright (C) 2002-2003, 2005-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ AC_DEFUN([gl_FUNC_STRNDUP], fi # 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_CACHE_CHECK([for working strndup], [gl_cv_func_strndup], [AC_RUN_IFELSE([ AC_LANG_PROGRAM([[#include #include ]], [[ @@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_STRNDUP], [gl_cv_func_strndup=yes])], [gl_cv_func_strndup=no])])]) if test $gl_cv_func_strndup = yes; then - AC_DEFINE([HAVE_STRNDUP], 1, + AC_DEFINE([HAVE_STRNDUP], [1], [Define if you have the strndup() function and it works.]) else HAVE_STRNDUP=0 diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index d8307ed..1c97859 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ -# strnlen.m4 serial 9 -dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc. +# strnlen.m4 serial 10 +dnl Copyright (C) 2002-2003, 2005-2007, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,8 +20,8 @@ AC_DEFUN([gl_FUNC_STRNLEN], # This is necessary because automake-1.6.1 doesn't understand # that the above use of AC_FUNC_STRNLEN means we may have to use # lib/strnlen.c. - #AC_LIBOBJ(strnlen) - AC_DEFINE(strnlen, rpl_strnlen, + #AC_LIBOBJ([strnlen]) + AC_DEFINE([strnlen], [rpl_strnlen], [Define to rpl_strnlen if the replacement function should be used.]) gl_PREREQ_STRNLEN fi diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 index 6ed66c9..70b3ba4 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -1,5 +1,5 @@ -# strtoimax.m4 serial 6 -dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +# strtoimax.m4 serial 7 +dnl Copyright (C) 2002, 2003, 2004, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_STRTOIMAX], gl_cv_func_strtoimax_macro=no)]) if test "$gl_cv_func_strtoimax_macro" != yes; then - AC_REPLACE_FUNCS(strtoimax) + AC_REPLACE_FUNCS([strtoimax]) if test $ac_cv_func_strtoimax = no; then gl_PREREQ_STRTOIMAX fi @@ -29,6 +29,6 @@ AC_DEFUN([gl_FUNC_STRTOIMAX], # Prerequisites of lib/strtoimax.c. AC_DEFUN([gl_PREREQ_STRTOIMAX], [ - AC_CHECK_DECLS(strtoll) + AC_CHECK_DECLS([strtoll]) AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) ]) diff --git a/m4/strtol.m4 b/m4/strtol.m4 index 7fbae60..25c09fd 100644 --- a/m4/strtol.m4 +++ b/m4/strtol.m4 @@ -1,10 +1,10 @@ -# strtol.m4 serial 4 -dnl Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. +# strtol.m4 serial 5 +dnl Copyright (C) 2002, 2003, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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_STRTOL], [ - AC_REPLACE_FUNCS(strtol) + AC_REPLACE_FUNCS([strtol]) ]) diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index c9b8951..7879c6f 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ -# strtoll.m4 serial 5 -dnl Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. +# strtoll.m4 serial 6 +dnl Copyright (C) 2002, 2004, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_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) + AC_REPLACE_FUNCS([strtoll]) if test $ac_cv_func_strtoll = no; then HAVE_STRTOLL=0 gl_PREREQ_STRTOLL diff --git a/m4/strtoul.m4 b/m4/strtoul.m4 index 5ec54aa..ca70006 100644 --- a/m4/strtoul.m4 +++ b/m4/strtoul.m4 @@ -1,10 +1,10 @@ -# strtoul.m4 serial 3 -dnl Copyright (C) 2002, 2006 Free Software Foundation, Inc. +# strtoul.m4 serial 4 +dnl Copyright (C) 2002, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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_STRTOUL], [ - AC_REPLACE_FUNCS(strtoul) + AC_REPLACE_FUNCS([strtoul]) ]) diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index 809d0bc..5075d95 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ -# strtoull.m4 serial 5 -dnl Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. +# strtoull.m4 serial 6 +dnl Copyright (C) 2002, 2004, 2006, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_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) + AC_REPLACE_FUNCS([strtoull]) if test $ac_cv_func_strtoull = no; then HAVE_STRTOULL=0 gl_PREREQ_STRTOULL diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index aef5b43..43236a0 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,5 +1,5 @@ -# strtoumax.m4 serial 6 -dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +# strtoumax.m4 serial 7 +dnl Copyright (C) 2002, 2003, 2004, 2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], gl_cv_func_strtoumax_macro=no)]) if test "$gl_cv_func_strtoumax_macro" != yes; then - AC_REPLACE_FUNCS(strtoumax) + AC_REPLACE_FUNCS([strtoumax]) if test $ac_cv_func_strtoumax = no; then gl_PREREQ_STRTOUMAX fi @@ -29,6 +29,6 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], # Prerequisites of lib/strtoumax.c. AC_DEFUN([gl_PREREQ_STRTOUMAX], [ - AC_CHECK_DECLS(strtoull) + AC_CHECK_DECLS([strtoull]) AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) ]) diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index cb0b3c8..911af0a 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ -# tm_gmtoff.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# tm_gmtoff.m4 serial 3 +dnl Copyright (C) 2002, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free 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_TM_GMTOFF], [ AC_CHECK_MEMBER([struct tm.tm_gmtoff], - [AC_DEFINE(HAVE_TM_GMTOFF, 1, + [AC_DEFINE([HAVE_TM_GMTOFF], [1], [Define if struct tm has the tm_gmtoff member.])], , [#include ]) diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 5685273..ff9a4ea 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 16 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# unistd_h.m4 serial 17 +dnl Copyright (C) 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -48,6 +48,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) + GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) @@ -63,6 +64,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) HAVE_GETUSERSHELL=1; AC_SUBST([HAVE_GETUSERSHELL]) + HAVE_LINK=1; AC_SUBST([HAVE_LINK]) HAVE_READLINK=1; AC_SUBST([HAVE_READLINK]) HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 6ef7168..0c84375 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ -#serial 5 +# serial 6 -# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,7 @@ AC_DEFUN([gl_UNLINKDIR], [ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_HEADERS_ONCE(priv.h) + AC_CHECK_HEADERS_ONCE([priv.h]) AC_LIBOBJ([unlinkdir]) @@ -27,7 +27,7 @@ AC_DEFUN([gl_UNLINKDIR], *-*-linux-* | *-*-linux | \ *-*-freebsd2.2* | *-*-freebsd[[3-9]]* | *-*-freebsd[[1-9]][[0-9]]* | \ *-cygwin) - AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], 1, + AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], [1], [Define to 1 if unlink (dir) cannot possibly succeed.]);; esac ]) diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index 20b2da2..cd5079b 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,7 +1,6 @@ -# unlocked-io.m4 serial 14 +# unlocked-io.m4 serial 15 -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +16,7 @@ dnl on Solaris 2.6). AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO], [ - AC_DEFINE([USE_UNLOCKED_IO], 1, + AC_DEFINE([USE_UNLOCKED_IO], [1], [Define to 1 if you want getc etc. to use unlocked I/O if available. Unlocked I/O can improve performance in unithreaded apps, but it is not safe for multithreaded apps.]) diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 9927908..062f736 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -1,6 +1,6 @@ -#serial 8 +# serial 9 -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2007 Free Software +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009 Free Software # Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -15,7 +15,7 @@ dnl Some systems have utime.h but don't declare the struct anywhere. AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF], [ - AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) + AC_CHECK_HEADERS_ONCE([sys/time.h utime.h]) AC_CACHE_CHECK([for struct utimbuf], [gl_cv_sys_struct_utimbuf], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -32,7 +32,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF], [gl_cv_sys_struct_utimbuf=no])]) if test $gl_cv_sys_struct_utimbuf = yes; then - AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, + AC_DEFINE([HAVE_STRUCT_UTIMBUF], [1], [Define if struct utimbuf is declared -- usually in . Some systems have utime.h but don't declare the struct anywhere. ]) fi diff --git a/m4/utime.m4 b/m4/utime.m4 index 967faa2..26b5ea9 100644 --- a/m4/utime.m4 +++ b/m4/utime.m4 @@ -1,9 +1,9 @@ -#serial 7 +# serial 8 dnl From Jim Meyering dnl Replace the utime function on systems that need it. -# Copyright (C) 1998, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1998, 2000-2001, 2003-2004, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,8 +14,8 @@ AC_DEFUN([gl_FUNC_UTIME], [ AC_REQUIRE([AC_FUNC_UTIME_NULL]) if test $ac_cv_func_utime_null = no; then - AC_LIBOBJ(utime) - AC_DEFINE(utime, rpl_utime, + AC_LIBOBJ([utime]) + AC_DEFINE([utime], [rpl_utime], [Define to rpl_utime if the replacement function should be used.]) gl_PREREQ_UTIME fi @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_UTIME], # Prerequisites of lib/utime.c. AC_DEFUN([gl_PREREQ_UTIME], [ - AC_CHECK_HEADERS_ONCE(utime.h) + AC_CHECK_HEADERS_ONCE([utime.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF]) gl_FUNC_UTIMES_NULL ]) diff --git a/m4/utimes-null.m4 b/m4/utimes-null.m4 index 8d5c8ae..dffa798 100644 --- a/m4/utimes-null.m4 +++ b/m4/utimes-null.m4 @@ -1,6 +1,6 @@ -#serial 7 +# serial 8 -# Copyright (C) 1998, 1999, 2001, 2003, 2004, 2006 Free Software +# Copyright (C) 1998-1999, 2001, 2003-2004, 2006, 2009 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL, dnl then do case-insensitive s/utime/utimes/. AC_DEFUN([gl_FUNC_UTIMES_NULL], -[AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null, +[AC_CACHE_CHECK([whether utimes accepts a null argument], [ac_cv_func_utimes_null], [rm -f conftest.data; > conftest.data AC_TRY_RUN([ /* In case stat has been defined to rpl_stat, undef it here. */ @@ -34,7 +34,7 @@ return ! (stat ("conftest.data", &s) == 0 rm -f core core.* *.core]) if test $ac_cv_func_utimes_null = yes; then - AC_DEFINE(HAVE_UTIMES_NULL, 1, + AC_DEFINE([HAVE_UTIMES_NULL], [1], [Define if utimes accepts a null argument]) fi ] diff --git a/m4/utimes.m4 b/m4/utimes.m4 index 7efb2b0..5b010ac 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,6 +1,6 @@ # Detect some bugs in glibc's implementation of utimes. -dnl Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2004, 2005, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -78,6 +78,6 @@ main () [gl_cv_func_working_utimes=no])]) if test $gl_cv_func_working_utimes = yes; then - AC_DEFINE([HAVE_WORKING_UTIMES], 1, [Define if utimes works properly. ]) + AC_DEFINE([HAVE_WORKING_UTIMES], [1], [Define if utimes works properly. ]) fi ]) diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index 536258c..9e839d2 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ -# vasnprintf.m4 serial 25 -dnl Copyright (C) 2002-2004, 2006-2008 Free Software Foundation, Inc. +# vasnprintf.m4 serial 26 +dnl Copyright (C) 2002-2004, 2006-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -20,7 +20,7 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF], AC_LIBOBJ([printf-parse]) AC_LIBOBJ([asnprintf]) if test $ac_cv_func_vasnprintf = yes; then - AC_DEFINE([REPLACE_VASNPRINTF], 1, + AC_DEFINE([REPLACE_VASNPRINTF], [1], [Define if vasnprintf exists but is overridden by gnulib.]) fi gl_PREREQ_PRINTF_ARGS @@ -58,7 +58,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF], AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) - AC_CHECK_FUNCS(snprintf wcslen) + AC_CHECK_FUNCS([snprintf wcslen]) dnl Use the _snprintf function only if it is declared (because on NetBSD it dnl is defined as a weak alias of snprintf; we prefer to use the latter). AC_CHECK_DECLS([_snprintf], , , [#include ]) @@ -73,7 +73,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_LONG_DOUBLE], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'long double' arguments.]) ;; @@ -89,7 +89,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_INFINITE_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_INFINITE_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for infinite 'double' arguments.]) ;; @@ -110,7 +110,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_INFINITE_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_INFINITE_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for infinite 'long double' arguments.]) ;; @@ -127,7 +127,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_A], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], 1, + AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], [1], [Define if the vasnprintf implementation needs special code for the 'a' and 'A' directives.]) AC_CHECK_FUNCS([nl_langinfo]) @@ -143,7 +143,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_F], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_DIRECTIVE_F], 1, + AC_DEFINE([NEED_PRINTF_DIRECTIVE_F], [1], [Define if the vasnprintf implementation needs special code for the 'F' directive.]) ;; @@ -158,7 +158,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_GROUPING], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_FLAG_GROUPING], 1, + AC_DEFINE([NEED_PRINTF_FLAG_GROUPING], [1], [Define if the vasnprintf implementation needs special code for the ' flag.]) ;; @@ -173,7 +173,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_FLAG_LEFTADJUST], 1, + AC_DEFINE([NEED_PRINTF_FLAG_LEFTADJUST], [1], [Define if the vasnprintf implementation needs special code for the '-' flag.]) ;; @@ -188,7 +188,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_ZERO], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_FLAG_ZERO], 1, + AC_DEFINE([NEED_PRINTF_FLAG_ZERO], [1], [Define if the vasnprintf implementation needs special code for the 0 flag.]) ;; @@ -203,13 +203,13 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_PRECISION], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_UNBOUNDED_PRECISION], 1, + AC_DEFINE([NEED_PRINTF_UNBOUNDED_PRECISION], [1], [Define if the vasnprintf implementation needs special code for supporting large precisions without arbitrary bounds.]) - AC_DEFINE([NEED_PRINTF_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'double' arguments.]) - AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'long double' arguments.]) ;; @@ -225,13 +225,13 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_ENOMEM], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_ENOMEM], 1, + AC_DEFINE([NEED_PRINTF_ENOMEM], [1], [Define if the vasnprintf implementation needs special code for surviving out-of-memory conditions.]) - AC_DEFINE([NEED_PRINTF_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'double' arguments.]) - AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'long double' arguments.]) ;; diff --git a/m4/wchar.m4 b/m4/wchar.m4 index 5c923fa..ba8ee6a 100644 --- a/m4/wchar.m4 +++ b/m4/wchar.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar.m4 serial 6 +# wchar.m4 serial 22 AC_DEFUN([gl_WCHAR_H], [ @@ -61,9 +61,39 @@ AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], AC_DEFUN([gl_WCHAR_H_DEFAULTS], [ - GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) + GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) + GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) + GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) + GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) + GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) + GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) + GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) + GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) + GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) + GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) + GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) + HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) + HAVE_MBRTOWC=1; AC_SUBST([HAVE_MBRTOWC]) + HAVE_MBRLEN=1; AC_SUBST([HAVE_MBRLEN]) + HAVE_MBSRTOWCS=1; AC_SUBST([HAVE_MBSRTOWCS]) + HAVE_MBSNRTOWCS=1; AC_SUBST([HAVE_MBSNRTOWCS]) + HAVE_WCRTOMB=1; AC_SUBST([HAVE_WCRTOMB]) + HAVE_WCSRTOMBS=1; AC_SUBST([HAVE_WCSRTOMBS]) + HAVE_WCSNRTOMBS=1; AC_SUBST([HAVE_WCSNRTOMBS]) + HAVE_DECL_WCTOB=1; AC_SUBST([HAVE_DECL_WCTOB]) HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) + REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) + REPLACE_BTOWC=0; AC_SUBST([REPLACE_BTOWC]) + REPLACE_WCTOB=0; AC_SUBST([REPLACE_WCTOB]) + REPLACE_MBSINIT=0; AC_SUBST([REPLACE_MBSINIT]) + REPLACE_MBRTOWC=0; AC_SUBST([REPLACE_MBRTOWC]) + REPLACE_MBRLEN=0; AC_SUBST([REPLACE_MBRLEN]) + REPLACE_MBSRTOWCS=0; AC_SUBST([REPLACE_MBSRTOWCS]) + REPLACE_MBSNRTOWCS=0;AC_SUBST([REPLACE_MBSNRTOWCS]) + REPLACE_WCRTOMB=0; AC_SUBST([REPLACE_WCRTOMB]) + REPLACE_WCSRTOMBS=0; AC_SUBST([REPLACE_WCSRTOMBS]) REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) WCHAR_H=''; AC_SUBST([WCHAR_H]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index cde2129..fb27a7f 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ -# wchar_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +# wchar_t.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2002-2003, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,11 +10,11 @@ dnl Prerequisite: AC_PROG_CC AC_DEFUN([gt_TYPE_WCHAR_T], [ - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, + AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t], [AC_TRY_COMPILE([#include wchar_t foo = (wchar_t)'\0';], , - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) + [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])]) if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) + AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.]) fi ]) diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 new file mode 100644 index 0000000..22d9433 --- /dev/null +++ b/m4/wcrtomb.m4 @@ -0,0 +1,88 @@ +# wcrtomb.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_WCRTOMB], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + + AC_REQUIRE([AC_TYPE_MBSTATE_T]) + AC_CHECK_FUNCS_ONCE([wcrtomb]) + if test $ac_cv_func_wcrtomb = no; then + HAVE_WCRTOMB=0 + else + + dnl On OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes + dnl returns 0 instead of 1. + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([gt_LOCALE_FR]) + AC_REQUIRE([gt_LOCALE_FR_UTF8]) + AC_REQUIRE([gt_LOCALE_JA]) + AC_REQUIRE([gt_LOCALE_ZH_CN]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether wcrtomb return value is correct], + [gl_cv_func_wcrtomb_retval], + [ + dnl Initial guess, used when cross-compiling or when no suitable locale + dnl is present. +changequote(,)dnl + case "$host_os" in + # Guess no on OSF/1 and Solaris. + osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_wcrtomb_retval="guessing yes" ;; + esac +changequote([,])dnl + if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then + AC_TRY_RUN([ +#include +#include +#include +#include +int main () +{ + if (setlocale (LC_ALL, "$LOCALE_FR") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + if (setlocale (LC_ALL, "$LOCALE_JA") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL) + { + if (wcrtomb (NULL, 0, NULL) != 1) + return 1; + } + return 0; +}], + [gl_cv_func_wcrtomb_retval=yes], + [gl_cv_func_wcrtomb_retval=no], + []) + fi + ]) + case "$gl_cv_func_wcrtomb_retval" in + *yes) ;; + *) REPLACE_WCRTOMB=1 ;; + esac + fi + if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then + gl_REPLACE_WCHAR_H + AC_LIBOBJ([wcrtomb]) + gl_PREREQ_WCRTOMB + fi +]) + +# Prerequisites of lib/wcrtomb.c. +AC_DEFUN([gl_PREREQ_WCRTOMB], [ + : +]) diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index af5ed93..47a4363 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ -# wint_t.m4 serial 2 (gettext-0.17) -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# wint_t.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 2003, 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ dnl Prerequisite: AC_PROG_CC AC_DEFUN([gt_TYPE_WINT_T], [ - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, + AC_CACHE_CHECK([for wint_t], [gt_cv_c_wint_t], [AC_TRY_COMPILE([ /* Tru64 with Desktop Toolkit C has a bug: must be included before . @@ -21,8 +21,8 @@ AC_DEFUN([gt_TYPE_WINT_T], #include #include wint_t foo = (wchar_t)'\0';], , - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) + [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])]) if test $gt_cv_c_wint_t = yes; then - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) + AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) fi ]) diff --git a/m4/xsize.m4 b/m4/xsize.m4 index 85bb721..631893c 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ -# xsize.m4 serial 3 -dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. +# xsize.m4 serial 4 +dnl Copyright (C) 2003-2004, 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,5 +9,5 @@ AC_DEFUN([gl_XSIZE], dnl Prerequisites of lib/xsize.h. AC_REQUIRE([gl_SIZE_MAX]) AC_REQUIRE([AC_C_INLINE]) - AC_CHECK_HEADERS(stdint.h) + AC_CHECK_HEADERS([stdint.h]) ]) diff --git a/po/bg.gmo b/po/bg.gmo index 0dc4e4a..f295b6d 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/bg.po b/po/bg.po index 1e9e5c9..84042ac 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "показва тази справка" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "показва кратко съобщение за използването" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "ИМЕ" @@ -119,11 +119,11 @@ msgstr "посочва името на програмата" msgid "SECS" msgstr "СЕК" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "спира за СЕК секунди (подразбира се 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "показва версията на програмата" @@ -322,11 +322,11 @@ msgstr "Полага се „.“ вместо празна цел на твър #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "„" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "“" @@ -381,7 +381,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -478,6 +478,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Съобщавайте за програмни грешки на <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Входният низ е твърде дълъг" @@ -514,15 +536,6 @@ msgstr "" " --version Извежда информация за версията.\n" " --help Извежда тази справка.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Съобщавайте за програмни грешки на <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Грешка при позициониране" @@ -547,104 +560,104 @@ msgstr "Преждевременен край на файла" msgid "Garbage command" msgstr "Непозната команда" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Общо записани байтове" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Общо прочетени байтове" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Общо изтрити байтове: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Неправилна стойност на record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Не е посочено име на архив" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Не може да се проверяват архиви на стандартните вход/изход" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архивът е компресиран. Използвайте опцията %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Не може да се актуализират компресирани архиви" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "В началото на лентата, край на изпълнението" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Твърде много грешки, край на изпълнението" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Размер на записа = %lu блок" msgstr[1] "Размер на записа = %lu блока" -#: src/buffer.c:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Невъзможно е връщане назад в архивния файл; той може да е нечитаем без опция " "-i" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не завърши при граница на запис" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: съдържа неправилен номер на том" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Препълване на номера на том" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Подгответе том №%d за %s и натиснете return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF, когато се очакваше отговор от потребителя" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ВНИМАНИЕ: Архивът е незавършен" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -656,66 +669,66 @@ msgstr "" " q Прекратява tar\n" " y или return Продължава изпълнението\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Поражда вторична командна обвивка\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Извежда този списък\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Няма повече томове; изход.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Не е посочено име на файл. Опитайте отново.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Неправилна команда. Използвайте ? за справка.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "командата %s не успя" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s вероятно продължава в този том: заглавният запис съдържа отрязано име" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продължава с този том" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s е грешен размер (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Този том е извън поредицата" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Архивът не е етикетиран да отговаря на %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Томът %s не съответства на %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -723,7 +736,7 @@ msgstr "" "%s: името на файла е твърде дълго, за да се побере в заглавен запис на " "многотомен ГНУ-архив и бе съкратено" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "EOF на архив %s не е на границата на блок" @@ -739,7 +752,7 @@ msgstr[1] "Само %lu от %lu байта можаха да се прочет msgid "Contents differ" msgstr "Съдържанието се различава" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Неочакван знак за край (EOF) в архива" @@ -859,7 +872,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -888,7 +901,7 @@ msgstr "%s: файлът е архив; не се архивира" msgid "%s: File removed before we read it" msgstr "%s: Файлът бе изтрит преди да бъде прочетен" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 #, fuzzy msgid "directory not dumped" msgstr "%s: каталогът е обозначен като кеш; не се архивира" @@ -984,122 +997,122 @@ msgstr "Бе невъзможно %s да се преименува на %s" msgid "Error is not recoverable: exiting now" msgstr "Грешката е непоправима: край на изпълнението" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталогът бе преименуват от %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталогът бе преименуван" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Каталогът е нов" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Записано е неправилно време" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Неправилно време на промяна (секунди)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Неправилно време на промяна (наносекунди)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Неправилен номер на устройство" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Неправилен номер на i-възел" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Твърде дълго поле при четене на snapshot-файл" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Грешка при четене в snapshot-файл" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Неочакван край на snapshot-файл" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Неочаквана стойност на поле в snapshot-файл" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Липсва завършител на записа" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Грешен инкрементален файлов формат" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Неподдържана версия на инкрементален формат: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Лошо формиран dumpdir: очаква се „%c“, а вместо това има %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Лошо формиран dumpdir: „X“ е дублиран" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Лошо формиран dumpdir: празно име в „R“" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Лошо формиран dumpdir: „T“ не се предхожда от „R“" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Лошо формиран dumpdir: празно име в „T“" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Лошо формиран dumpdir: очаква се „%c“, вместо това данните свършват" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Лошо формиран dumpdir: „X“ никога не се използва" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Не може да се създаде временен каталог, използвайки шаблона %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталогът не се изчиства: не може да се достъпи" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: каталогът е на друго устройство: не се изчиства" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Изтрива се %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Не може да се изтрие" @@ -1323,86 +1336,86 @@ msgstr "" "иначе\n" " never, simple винаги да се правят прости резервни копия\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Вид основно действие:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "изрежда съдържанието на архив" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "извлича файлове от архива" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "създава нов архив" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "намира разликите между архива и файловата система" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "добавя файлове в края на архив" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "добавя само файлове, по-нови от копието в архива" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "прибавя tar-файлове към архива" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "трие файлове от архива (не при магнитни ленти!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "проверява етикета на тома и завършва" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Модификатори на действието:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "работи ефективно с разредени файлове" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "ГОЛЯМ[.МАЛЪК]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "определя версията на формата разредени файлове (влече --sparse)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "със стар формат ГНУ за инкрементално архивиране" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "с новия формат на ГНУ за инкрем. архивиране" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "при нечитаеми файлове не завършва с грешка" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1414,118 +1427,118 @@ msgstr "" "list и когато списъкът от файлове е зададен или на командния ред, или с " "опция -T. Ако не е посочен N, се подразбира 1." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "архивът е с произволен достъп" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Регулиране заместването на файлове:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "след записа опитва да провери архива" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "изтрива файловете след като ги добави в архива" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "при извличане не замества съществуващи файлове" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "не замества съществуващи файлове, ако са по-нови от копията им в архива" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "при извличане замества съществуващи файлове" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "изтрива всеки файл преди да извлича върху него" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "изпразва йерархията преди извличане на каталог" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "запазва метаданните на съществуващи каталози" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "при извличане замества метаданните на съществуващи каталози (подразбира се)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Избор на изходен поток:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "извлича файловете на стандартния изход" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "подава с канал всеки извлечен файл към КОМАНДА" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "игнорира кода на завършване на породени процеси" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "счита за грешка всеки ненулев код на завършване на породен процес" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Подход спрямо файловите атрибути:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "прави ИМЕ да е собственик на добавените файлове" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "прави ИМЕ да бъде групата на добавените файлове" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "прави времето на промяна на добавяни файлове като ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "ПРОМЕНИ" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "модифицира режима за достъп на добавени файлове" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1535,29 +1548,29 @@ msgstr "" "времената след четене (при МЕТОД=„replace“, подразбира се), или не променя " "имената изобщо (МЕТОД=„system“)" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "не извлича времето на промяна на файловете" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "опитва да възстановява собствеността на файловете" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "извлича файловете от ваше име" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "използва числа вместо имена за потребител и група" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "възстановява точно (без umask) режима на достъп (подразбира се при " "привилегирован потребител)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1565,15 +1578,15 @@ msgstr "" "прилага umask на потребителя при извличане на файлове (подразбира се при " "обикновен потребител)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "файловете за извличане са сортирани според архива" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "същото като едновременно -p и -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1581,139 +1594,139 @@ msgstr "" "забавя настройката на времето на промяна и режима за достъп на извличаните " "каталози докато извличането завърши" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "отменя ефекта на --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Избор на устройство и смяна:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "АРХИВ" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "използва архивния файл или устройство АРХИВ" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "архивният файл е локален дори при двуеточие" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "използва посочената КОМАНДА вместо rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "използва посочената КОМАНДА вместо rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "посочва устройство и гъстота" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "създава/извежда/извлича многотомен архив" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "смяна на лентата след запис на 1024 x N байта" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "изпълнява скрипт в края на всяка лента (влече -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "ползва от и обновява във ФАЙЛ номера на тома" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Блокуване на устройството:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "БЛОКОВЕ" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "БЛОКОВЕ x 512 байта в секунда" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "прави N-байтови записи, кратно на 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "пренебрегва блоковете от нули и продължава" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "преформира при четене блоковете (канали 4.2BSD)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Избор на архивен формат:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "създава архив с посочения формат" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "ФОРМАТ е някой от следните:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "стар формат tar, V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "формат на ГНУ при tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "формат на версия 1.13.x на tar на ГНУ" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "същото като pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "същото като --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "същото като --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ключдума[[:]=стойност][,ключдума[[:]=стойност]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "управляващи ключови думи за pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1721,193 +1734,199 @@ msgstr "" "създава архив с име на том ТЕКСТ; при извеждане или извличане сравнява името " "на тома с ТЕКСТ" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Противоречащи си опции за компресиране" -#: src/tar.c:596 +#: src/tar.c:595 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Не може да се пише към компресиращата програма" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" -msgstr "" +#: src/tar.c:597 +#, fuzzy +msgid "do not use archive suffix to determine the compression program" +msgstr "Не може да се пише към компресиращата програма" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "прекарва архива през bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "прекарва архива през gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "прекарва архива през compress" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "прекарва архива през gzip" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "прекарва архива през gzip" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "прекарва архива през gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "прекарва архива през ПРОГ (трябва да приема -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Избор на локален файл:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "добавя посочения ФАЙЛ към архива (полезно е, ако името му започва с минус)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "КАТ" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "работи в каталога КАТ" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "взема имената за извличане или създаване от ФАЙЛ" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T чете имена, завършващи с нулев байт" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "декодира „\\“ във файловите имена на -T (подразб.)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "не декодира „\\“ във файловите имена на -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "ОБРАЗЕЦ" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "без файловете, отговарящи на ОБРАЗЕЦ" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "пропуска файловете, отговарящи на образци в ФАЙЛ" -#: src/tar.c:640 +#: src/tar.c:641 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:648 +#: src/tar.c:649 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:653 +#: src/tar.c:654 #, fuzzy msgid "exclude directories containing FILE" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "без автоматично влизане в подкаталозите" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "работи в рамките на локалната файлова система" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "влиза рекурсивно в подкаталозите (подразбира се)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "не маха „/“ в началото на файлови имена" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "следва симв. връзки; архивира сочените файлове" -#: src/tar.c:667 +#: src/tar.c:668 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "следва симв. връзки; архивира сочените файлове" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "ЧЛЕН-ИМЕ" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "започва от файл с име ЧЛЕН-ИМЕ в архива" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "съхранява само файлове, по-нови от ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "сравнява времето само ако данните са променени" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "МЕТОД" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "резервно копира съществуващи файлове с МЕТОД" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "НИЗ" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1916,89 +1935,89 @@ msgstr "" "освен ако не е бил сменен с променливата от обкръжението " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Промени на файловите имена:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "при извличане маха N начални каталози от файловите пътеки" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "ИЗРАЗ" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "преобразува файловите имена, използвайки посочения ИЗРАЗ за замяна на sed" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Съпоставяне с файлови имена (влияе и на включващи, и на изключващи образци):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "пренебрегва разликата между големи/малки букви" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "съпоставянето с образците започва от началото на файловото име" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "съпоставянето започва след кой да е „/“ (подразбира се при изключване)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "отчита се разликата между малки и големи букви (подразбира се)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "ползва „*“ и „?“ (подразбира се за изключване)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "дословно низово сравнение" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "„/“ не пасва с „*“ и „?“" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "„/“ пасва с „*“ и „?“ (подразб. за изключване)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Извеждане на информация:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "подробно изрежда обработените файлове" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "извежда напредъка след всеки N-ти запис (подразбира се 10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "съобщава, ако не всички твърди връзки са включени" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2009,27 +2028,27 @@ msgstr "" "извежда текущите байтове при получаване на СИГНАЛ. Допустими СИГНАЛи са " "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2; имената без SIG също са позволени" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "извежда времената по Гринуич" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "изпраща подробния изход във ФАЙЛ" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "показва номера на блок в архива с всяко съобщение" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "изисква потвърждение за всяко действие" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "показва подразбираното от tar" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2037,32 +2056,32 @@ msgstr "" "при извеждане или извличане изрежда всеки каталог, който се пропуска по " "някаква причина" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "показва преобразуваните файлови имена в архива" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "НАЧИН" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "начин за цитиране на специални знаци; вж. по-долу за стойностите на НАЧИН" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "работи и със знаците от НИЗ като със специални" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "не работи със знаците от НИЗ като със специални" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Опции за съвместимост:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2070,56 +2089,56 @@ msgstr "" "при създаване е същото като --old-archive; при извличане е същото като --no-" "same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Други опции:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "забранява някои потенциално опасни опции" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Не може да се използва повече от една опция „-Acdtrux“" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Противоречащи си опции за компресиране" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Непознато име на сигнал: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Не е открит еталлонният файл за дата" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Използва се %s вместо непознатия файлов формат за дата %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Опция %s: Датата „%s“ се разглежда като %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: файловият списък вече е прочетен" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: файловото име съдържа нулев байт" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Правилни аргументи за опциите --quoting-style са:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2127,163 +2146,159 @@ msgstr "" "\n" "*Този* tar подразбира следното:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Неправилен фактор за блокуване" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Неправилна дължина на лента" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Повече от една ограничителна дата" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Неправилна версия на формат разредени файлове" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' не се поддържа на тази платформа" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "стойността на --checkpoint не е цяло число" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Неправилна група" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "На опция е подаден неправилен режим" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Неправилно число" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Неправилен собственик" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Неправилен размер на запис" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Размерът на запис трябва да е кратен на %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Неправилен брой елементи" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Позволява се само една опция --to-command" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Лошо образуван аргумент за гъстота: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Непозната гъстота: „%c“" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Опциите „-[0-7][lmh]“ не се поддържат от *този* tar" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Старата опция „%c“ изисква аргумент." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "без списък файлове опцията --occurrence е безсмислена" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "не може да се използва --occurrence при пожелания начин на работа" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Използването на много архивни файлове изисква опция „-M“" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Не може да се съчетават --listed-incremental с --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Не може да се проверяват многотомни архиви" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Не може да се проверяват компресирани архиви" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Не може да се използват многотомни компресирани архиви" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Не може да се съединяват компресирани архиви" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" "опцията --pax-option може да се използва само при архиви във формат POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Страхлив отказ да се създава празен архив" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Опциите „-Aru“ са несъвместими с „-f -“" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Трябва да посочите поне една от опциите „-Acdtrux“" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2656,6 +2671,10 @@ msgstr "--stat изисква файлови имена" msgid "too many arguments" msgstr "твърде много аргументи" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "" +#~ "Внимание: опцията -I не се поддържа. Може би имате предвид -j или -T?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "отменя ефекта на --delay-directory-restore" diff --git a/po/cs.gmo b/po/cs.gmo index 77d2d0d..a2dc040 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 0ff1824..927042e 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -122,11 +122,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -324,11 +324,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -383,7 +383,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -480,6 +480,29 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +" Chyby v programu oznamujte na adrese (pouze anglicky),\n" +"pøipomínky k pøekladu zasílejte na adresu (èesky).\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -516,16 +539,6 @@ msgstr "" " --version Vypí¹e oznaèení verze\n" " --help Vypí¹e tuto nápovìdu\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -" Chyby v programu oznamujte na adrese (pouze anglicky),\n" -"pøipomínky k pøekladu zasílejte na adresu (èesky).\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -551,103 +564,103 @@ msgstr "P msgid "Garbage command" msgstr "Neznámý pøíkaz" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Celkem zapsáno bajtù: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Celkem zapsáno bajtù: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(roura)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Chybná hodnota pro velikost záznamu" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Název archivu nebyl zadán" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Stdin/Stdout archiv nelze ovìøit" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Komprimovaný archiv nelze aktualizovat" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Páska na zaèátku, konèím" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Pøíli¹ mnoho chyb, konèím" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: obsahuje neplatné èíslo svazku" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "U èísla svazku nastalo pøeteèení" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Místo u¾ivatelské odpovìdi byl zadán konec souboru" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "VAROVÁNÍ: Archiv je nekompletní" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -659,71 +672,71 @@ msgstr "" " ! Vytvoøení podshell\n" " ? Vypísání této nápovìdy\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Není nový svazek; konèím.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "pøíkaz `%s' selhal" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s nepokraèuje na tomto svazku" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je ¹patné délky (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, 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:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Pro vyhodnocení vzorku `%s' musí být archiv pojmenován" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Svazek %s neodpovídá vzorku %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -738,7 +751,7 @@ msgstr[1] "Lze msgid "Contents differ" msgstr "Obsah se li¹í" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Neoèekávaný konec archivu" @@ -856,7 +869,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -885,7 +898,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -980,124 +993,124 @@ msgstr "%s: nelze p msgid "Error is not recoverable: exiting now" msgstr "Z chyby se nelze zotavit: ukonèuji se" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Adresáø byl pøejmenován" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Adresáø byl pøejmenován" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Adresáø je nový" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Neplatný èas souboru" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Zadána chybná práva" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Neplatné èíslo zaøízení" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Neplatné èíslo i-uzlu" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekávaný konec archivu" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Ma¾u %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nelze smazat" @@ -1320,88 +1333,88 @@ msgstr "" " existují, jinak tvoøí jednoduché\n" " never, simple tvoøí v¾dy jednoduché zálo¾ní kopie souborù\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Neoèekávaný konec archivu" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 #, fuzzy msgid "append files to the end of an archive" msgstr "%d bajtù smetí ma konci archivu ignorováno" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1409,572 +1422,577 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Chyba pøi zápise na standardní výstup" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Vícesvazkový archiv není mo¾né ovìøit" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Odporující si archivní formáty" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Odporující si kompresní pøepínaèe" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: soubor je archiv; nearchivován" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: soubor je archiv; nearchivován" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Pracovní adresáø nelze zmìnit" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Odstraòuji úvodní `%.*s' z názvù souborù" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "Svazek %s neodpovídá vzorku %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1982,278 +2000,274 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Odporující si kompresní pøepínaèe" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " neznámý souborový typ %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Soubor ze kterého se má vzít datum a èas nebyl nalezen" -#: src/tar.c:1017 +#: src/tar.c:1018 #, 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:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: soubor je archiv; nearchivován" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Neplatný poèet bajtù na záznam" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Neplatná délka pásky" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Více ne¾ jedeno poèáteèní datum" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Neplatná skupina" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Zadána chybná práva" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Neplatné èíslo i-uzlu" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Neplatný vlastník" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Chybná velikost záznamu" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Velikost záznamu musí být násobek %d." -#: src/tar.c:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "Neplatná délka pásky" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Neznámý vzorek `%s'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Pøepínaè `%c' vy¾aduje argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Více archivaèních souborù vy¾aduje pøepínaè `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental a --newer nelze kombinovat" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Vícesvazkový archiv není mo¾né ovìøit" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Komprimovaný archiv nelze ovìøit" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Vícesvazkový komprimovaný archiv nelze vytvoøit" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Komprimovaný archiv nelze aktualizovat" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Vytvoøení prázdného archivu odmítnuto." -#: src/tar.c:2389 +#: src/tar.c:2388 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:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Musíte zadat jeden z pøepínaèù `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2605,6 +2619,9 @@ msgstr "--Rozd msgid "too many arguments" msgstr "" +#~ 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?" + #~ msgid "block size" #~ msgstr "velikost bloku" diff --git a/po/da.gmo b/po/da.gmo index 4bf1a49..18f06cf 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 2b573f5..a729114 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2002-03-27 13:57+0100\n" "Last-Translator: Keld Jørn Simonsen \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -315,11 +315,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "'" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -374,7 +374,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -471,6 +471,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Rapportér fejl til .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -507,15 +529,6 @@ msgstr "" " --help vis denne hjælpetekst\n" " --version vis programversion\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Rapportér fejl til .\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -541,103 +554,103 @@ msgstr "For tidlig filafslutning" msgid "Garbage command" msgstr "Ugyldig kommando" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Totalt antal byte skrevet: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Totalt antal byte skrevet: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(datakanal)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Ugyldig værdi for record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Arkivnavn er ikke opgivet" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Kan ikke verificere standard-ind/standard-ud arkiver" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Kan ikke opdatere komprimerede arkiver" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Ved begyndelsen af båndet, afslutter nu" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "For mange fejl, afslutter" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: indeholder ugyldigt delarkivs-nummer" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Overløb på delarkiv-nummer" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Filafslutning hvor svar fra bruger var forventet" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ADVARSEL: Arkivet er ufuldstændigt" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -649,71 +662,71 @@ msgstr "" " ! Start en skal\n" " ? Skriv denne list\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Intet nyt delarkiv; afslutter.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "'%s'-kommando mislykkedes" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsætter ikke i dette delarkiv" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har forkert størrelse (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, 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:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkivet er ikke navngivet til at passe med %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Volumenet '%s' stemmer ikke overens med %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -728,7 +741,7 @@ msgstr[1] "Kunne kun l msgid "Contents differ" msgstr "Indhold er forskelligt" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Uventet filslutning i arkivet" @@ -846,7 +859,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -875,7 +888,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -970,124 +983,124 @@ msgstr "%s: Kan ikke omd msgid "Error is not recoverable: exiting now" msgstr "Fejl kan ikke reddes; afslutter nu" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Kataloget er blevet omdøbt" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Kataloget er blevet omdøbt" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Kataloget er nyt" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Ugyldigt tidsstempel" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Ugyldig modus angivet i flag" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Ugyldigt enhedsnummer" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Ugyldigt inode-nummer" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutning i arkivet" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "kan ikke oprette kataloget '%s'" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" @@ -1308,88 +1321,88 @@ msgstr "" " ellers simple\n" " never, simple lav simple sikkerhedskopier\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Uventet filslutning i arkivet" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 #, fuzzy msgid "append files to the end of an archive" msgstr "%d overflødige byte ignoreret ved slutningen på arkiv" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1397,572 +1410,577 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Fejl ved skrivning til standard uddata" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Kan ikke verificere arkiv som går over flere delarkiver" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Konflikt i flagene for arkiv-format" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Konflikt i komprimeringsflag" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: fil er det samme som arkivet; ikke lagret" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: fil er det samme som arkivet; ikke lagret" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Kan ikke ændre arbejdskatalog" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Fjerner indledende '/' fra absolutte lænker" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "Volumenet '%s' stemmer ikke overens med %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1970,279 +1988,275 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Du kan ikke angive mere end et af '-Acdtrux'-flagene" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Konflikt i komprimeringsflag" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " ukendt filtype %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Datofil ikke fundet" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Erstatter %s for ukendt dato-format %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: fil er det samme som arkivet; ikke lagret" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Ugyldig blokfaktor" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Ugyldig båndlængde" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Mere end én grænse-dato" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: ugyldig gruppe" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Ugyldig modus angivet i flag" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Ugyldigt inode-nummer" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Ugyldig ejer" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Ugyldig poststørrelse" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Poststørrelse skal være deleligt med %d." -#: src/tar.c:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "Ugyldig båndlængde" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Ukendt mønster '%s'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Gammelt flag '%c' behøver et argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Ved flere arkivfiler kræves '-M'-flaget" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Kan ikke kombinere --listed-incremental med --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Kan ikke verificere arkiv som går over flere delarkiver" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Kan ikke verificere komprimerede arkiver" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Kan ikke bruge komprimerede arkiver som går over flere delarkiver" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Kan ikke opdatere komprimerede arkiver" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Nægter stædigt at oprette et tomt arkiv" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Flagene '-Aru' er inkompatible med '-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Du skal angive et af '-Acdtrux'-flagene" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2595,6 +2609,10 @@ msgstr "-- msgid "too many arguments" msgstr "" +#~ 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?" + #~ msgid "block size" #~ msgstr "blokstørrelse" diff --git a/po/de.gmo b/po/de.gmo index 7ac365f..745c4d8 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index a365146..9219c04 100644 --- a/po/de.po +++ b/po/de.po @@ -4,14 +4,14 @@ # Ulrich Drepper , 1995? # Karl Eichwalder , 1996 # Christian Kirsch , 1996, 2001 -# Michael Piefel , 2003, 2006, 2007, 2008 +# Michael Piefel , 2003, 2006, 2007, 2008, 2009 # msgid "" msgstr "" -"Project-Id-Version: tar 1.20\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-04-15 15:40+0100\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2009-01-05 10:25+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -84,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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an %s.\n" @@ -93,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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "diese Hilfe ausgeben" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "eine kurze Benutzungsübersicht ausgeben" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NAME" @@ -114,11 +114,11 @@ msgstr "den Programmnamen setzen" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "für SEK Sekunden hängenbleiben (Voreinst.: 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "Programmversion ausgeben" @@ -315,11 +315,11 @@ msgstr "Ersetze „.“ für leeres Ziel einer harten Verknüpfung" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "„" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "“" @@ -371,10 +371,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -494,6 +495,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s und anderen.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Eingabezeichenkette zu lang" @@ -531,15 +554,6 @@ msgstr "" " --version Versionsinformation ausgeben\n" " --help diesen Hilfetext ausgeben\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Melden Sie Fehler (auf Englisch, mit LC_ALL=C) an <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Fehler bei der Positionierungsangabe." @@ -564,102 +578,102 @@ msgstr "Vorzeitiges Dateiende." msgid "Garbage command" msgstr "Ungültiges Kommando." -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Gesamtzahl geschriebener Bytes" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Gesamtzahl gelesener Bytes" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Gesamtzahl gelöschter Bytes: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Ungültiger Wert für „record_size“." -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Kein Archivname angegeben" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Kann Archive auf Standard-Ein-/Ausgabe nicht prüfen." -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archiv ist komprimiert. Benutzen Sie die Option %s." -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Kann komprimierte Archive nicht aktualisieren" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Am Anfang des Mediums, beende jetzt." -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Zu viele Fehler, beende." -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "„rmtlseek“ nicht an Recordgrenze angehalten" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: enthält ungültige Teil-Nummer." -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Teil-Nummer zu groß." -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Dateiende gefunden, Benutzereingabe erwartet" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "WARNUNG: Archiv unvollständig" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -671,67 +685,67 @@ msgstr "" " q „tar“ abbrechen\n" " j oder Enter fortfahren\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Shell in einem Unterprozess starten\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? diese Liste ausgeben\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Kein neues Medium; halte an.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Dateiname nicht angegeben. Versuchen Sie es noch einmal.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ungültige Eingabe. Geben Sie „?“ für Hilfe ein.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "„%s“-Kommando gescheitert." -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "Dieser Teil ist keine Fortsetzung von %s." -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s hat die falsche Größe (%s != %s + %s)." -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Dieser Teil ist nicht an der Reihe." +msgstr "Dieser Teil ist nicht an der Reihe (%s - %s != %s)." -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Kennzeichnung des Archivs passt nicht zu „%s“." -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Teil „%s“ passt nicht zu „%s“." -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -739,10 +753,9 @@ msgstr "" "%s: Dateiname zu lang, um in einem GNU-Mehrteil-Kopf abgelegt werden zu " "können, abgeschnitten" -#: src/buffer.c:1619 -#, fuzzy +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "„rmtlseek“ nicht an Recordgrenze angehalten" +msgstr "Schreiben endete nicht an Blockgrenze" #: src/compare.c:96 #, c-format @@ -755,7 +768,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Unerwartetes Dateiende im Archiv." @@ -874,7 +887,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "Inhalt nicht gesichert" @@ -903,7 +916,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "Verzeichnis nicht gesichert" @@ -998,124 +1011,124 @@ msgstr "Kann %s nicht in %s umbenennen." msgid "Error is not recoverable: exiting now" msgstr "Nicht behebbarer Fehler: Programmabbruch. " -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Verzeichnis wurde von „%s“ umbenannt." -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Verzeichnis wurde umbenannt." -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "Verzeichnis „%s“ ist neu." -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Ungültiges Datum" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Ungültige Änderungszeit (Sekunden)." -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Ungültige Änderungszeit (Nanosekunden)." -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Ungültige Gerätenummer" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Ungültige Inode-Nummer" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Feld zu lang beim Lesen der Schnappschussdatei" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Lesefehler in Schnappschussdatei" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Unerwartetes Dateiende im Schnappschussdatei." -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Unerwarteter Feldwert in Schnappschussdatei" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Fehlender Record-Abschluss" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "unzulässiges inkrementelles Dateiformat" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nicht unterstützte Version des inkrementellen Formats: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Fehlgeformtes Verzeichnis für Dump: „%c“ erwartet, aber %#3o gefunden" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ dupliziert" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „R“" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: „T“ folgt nicht „R“" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „T“" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ nie benutzt" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kann kein temporäres Verzeichnis mit der Schablone %s anlegen" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Entferne Verzeichnis nicht: kann nicht zugreifen" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Lösche %s.\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kann nicht entfernen." @@ -1341,86 +1354,86 @@ msgstr "" " vorhanden sind, sonst einfache\n" " never, simple immer einfache Sicherheitskopien\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Hauptsächlicher Arbeitsmodus:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "den Inhalt eines Archivs auflisten" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "Dateien aus einem Archiv extrahieren" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "ein neues Archiv anlegen" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "Unterschiede zwischen Archiv und Dateisystem suchen" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "Dateien hinten an das Archiv anfügen" -#: src/tar.c:386 +#: src/tar.c:385 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:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "tar-Dateien an ein Archiv anfügen" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "aus dem Archiv löschen (nicht auf Magnetband!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "den Archiv-Teil-Namen überprüfen und beenden" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Feineinstellungen:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "löchrige Dateien („sparse files“) effizient behandeln" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "zu benutzende Version des Sparse-Formats setzen (impliziert --sparse)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "inkrementelle Sicherung im alten GNU-Format" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "DATEI" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "inkrementelle Sicherung im neuen GNU-Format" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "kein Abbruch mit Existatus!=0 bei unlesbaren Dateien" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "ZAHL" -#: src/tar.c:411 +#: src/tar.c:410 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,122 +1445,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "im Archiv kann positioniert werden" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "Gerätenummer bei Erstellung inkrementeller Archive nicht prüfen" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" "Gerätenummer bei Erstellung inkrementeller Archive prüfen (Voreinstellung)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Steuerung des Überschreibens:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "Archiv nach dem Schreiben prüfen" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "Dateien nach dem Hinzufügen zum Archiv löschen" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "vorhandene Dateien beim Extrahieren nicht überschreiben" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "vorhandene Dateien beim Extrahieren überschreiben" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "zu überschreibende Dateien vor dem Extrahieren löschen" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" "Verzeichnishierarchien rekursiv vor dem Extrahieren eines Verzeichnisses " "löschen" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "Metadaten existierender Verzeichnisse erhalten" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "Metadaten existierender Verzeichnisse beim Extrahieren überschreiben " "(Voreinstellung)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Wahl des Ausgabestroms:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "Dateien auf die Standardausgabe extrahieren" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "BEFEHL" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "extrahierte Dateien an ein anderes Programm weiterreichen" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "Exitstatus der Kinder ignorieren" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "Exitstatus!=0 von Kindern als Fehler ansehen" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Behandlung der Datei-Attribute:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "Eigentümer für hinzugefügte Dateien auf NAME setzen" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "Gruppe für hinzugefügte Dateien auf NAME setzen" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATUM-ODER-DATEI" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "ÄNDERUNGEN" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "den (symbolischen) Modus ÄNDERUNGEN für hinzugefügte Dateien erzwingen" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METHODE" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1558,30 +1571,30 @@ msgstr "" "oder dadurch, dass die Zeiten gar nicht erst neu gesetzt werden (METHODE=" "„system“)" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "die geänderte Zeit nicht extrahieren" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" "versuchen, die Dateien mit denselben Eigentumsverhältnisse zu extrahieren" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "Dateien als aktueller Nutzer extrahieren" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "immer Zahlen für Nutzer-/Gruppennamen verwenden" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "Informationen über Dateizugriffsrechte mit extrahieren (Voreinstellung für " "Root)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1589,15 +1602,15 @@ msgstr "" "die Umask des Nutzers anwenden beim Extrahieren von Dateizugriffsrechte aus " "dem Archiv (Voreinstellung für normale Nutzer)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "zu entpackende Dateinamen wie im Archiv sortieren" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "wie -p und -s zusammen" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1605,139 +1618,139 @@ msgstr "" "das Setzen von Zugriffszeiten und Rechten von extrahierten Verzeichnissen " "verschieben bis zum Ende des Entpackens" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "den Effekt von --delay-directory-restore aufheben" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Geräteauswahl und -umschaltung:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIV" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "Archivdatei oder Gerät ARCHIV benutzen" -#: src/tar.c:515 +#: src/tar.c:514 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "statt „rmt“ den gegebenen BEFEHL benutzen" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "statt „rsh“ den entfernten BEFEHL benutzen" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "Laufwerk und Schreibdichte angeben" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "mehrteiliges Archiv anlegen/listen/extrahieren" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Medium wechseln, wenn ZAHL × 1024 Bytes geschrieben wurden" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "am Ende jedes Mediums das Skript ausführen (impliziert -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "Teil-Nummer in DATEI benutzen/aktualisieren" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Blockung des Gerätes:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLÖCKE" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLÖCKE × 512 Bytes pro Record" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ZAHL Bytes pro Record, Vielfaches von 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Blöcke mit Nullen im Archiv ignorieren (heißt EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "erneut Blocken beim Lesen (für 4.2BSD‐Pipes)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Auswahl des Archiv-Formats:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "Archiv mit dem gegebenen Format anlegen" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMAT ist eines der folgenden:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "altes V7-tar-Format" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU-Format wie mit tar <=1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU-tar-1.13.x-Format" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Format von POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Format von POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "wie pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "wie --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "wie --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "Schlüsselwort[[:]=Wert][,Schlüsselwort[[:]=Wert]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "Pax-Schlüsselwörter steuern" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1745,100 +1758,104 @@ msgstr "" "Archiv mit dem Teilnamen TEXT anlegen; beim Listen/Extrahieren, TEXT als " "Muster für den Teilnamen benutzen" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Kompressionsoptionen:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "Archiverweiterung nehmen, um Kompressionsprogramm zu bestimmen" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" -msgstr "Archiverweiterung nehmen, um Kompressionsprogramm zu bestimmen" +msgid "do not use archive suffix to determine the compression program" +msgstr "Archiverweiterung nicht nehmen, um Kompressionsprogramm zu bestimmen" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "Archiv durch bzip2 filtern" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "Archiv durch gzip filtern" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "Archiv durch compress filtern" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "Archiv durch lzma filtern" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "Archiv durch gzip filtern" +msgstr "Archiv durch lzop filtern" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "Archiv durch gzip filtern" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "durch PROG filten (muss -d akzeptieren)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Auswahl der lokalen Dateien:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "VERZEICHNIS" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "zu VERZEICHNIS wechseln" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "Namen der zu bearbeitenden Dateien aus DATEI lesen" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T liest null-terminierte Namen, verbiete -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "die Wirkung der vorangehenden Option --null aufheben" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" "Dateinamen, die mit -T gelesen werden, von Zitat befreien (Voreinstellung)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "Dateinamen, die mit -T gelesen werden, nicht von Zitat befreien" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "MUSTER" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "Dateien auslassen, auf die MUSTER passt" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "Dateien auslassen, auf die in DATEI angegebene Muster passen" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1846,93 +1863,93 @@ msgstr "" "Inhalt von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten, außer der " "Markierungsdatei selbst" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" "alles unterhalb von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Verzeichnisse auslassen, die CACHEDIR.TAG enthalten" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "alles unterhalb von Verzeichnissen auslassen, die DATEI enthalten" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "Verzeichnisse auslassen, die DATEI enthalten" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "Verzeichnisse von Versionskontrollsystemen auslassen" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "automatischen Abstieg in Vezeichnisse vermeiden" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "beim Anlegen eines Archivs im lokalen Dateisystem bleiben" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "in Verzeichnisse absteigen (Voreinstellung)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "führende „/“-Zeichen in den Dateinamen erhalten" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "ELEMENT-NAME" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "mit ELEMENT-NAME im Archiv beginnen" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "nur Dateien ablegen, die neuer als DATUM-ODER-DATEI sind" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATUM" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "Datum und Zeit nur überprüfen, wenn Daten geändert wurden" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "KONTROLLE" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "Sicherung vor dem Entfernen, wähle Versions-KONTROLLE" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "ZEICHENKETTE" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1940,90 +1957,90 @@ msgstr "" "Sicherung vor dem Entfernen, übliches Suffix ersetzen („~“, wenn nicht durch " "Umgebungsvariable SIMPLE_BACKUP_SUFFIX anders gesetzt)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Dateinamentransformationen:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "ZAHL führende Komponenten beim Extrahieren von Dateinamen entfernen" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "AUSDRUCK" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "den sed-AUSDRUCK zur Dateinamentransformation benutzen" -#: src/tar.c:694 +#: src/tar.c:695 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:697 +#: src/tar.c:698 msgid "ignore case" msgstr "Groß-/Kleinschreibung ignorieren" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "Muster am Dateinamensanfang ausrichten" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "Muster passen nach jedem „/“ (Voreinstellung beim Ausschluss)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "Groß-/Kleinschreibung beachten (Voreinstellung)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "Muster benutzen (Voreinstellung für Ausschluss)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "Zeichenketten sind buchstabengetreu" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "Jokerzeichen passen nicht auf „/“" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "Jokerzeichen passen auf „/“ (Voreinstellung für Ausschluss)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Informationen:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "bearbeitete Dateien ausführlich listen" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Fortschrittsnachrichten bei jedem ZAHLten Record (Voreinstellung 10) anzeigen" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "AKTION" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "AKTION bei jedem Kontrollpunkt ausführen" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" "eine Nachricht ausgeben, wenn nicht alle Verknüpfungen abgespeichert werden" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2035,27 +2052,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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "Dateiänderungszeiten in UTC anzeigen" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "ausführliche Ausgabe in DATEI schreiben" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "bei jeder Nachricht die Blocknummer innerhalb des Archivs mit anzeigen" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "für jede Aktion um Bestätigung bitten" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "Voreinstellungen von tar anzeigen" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2063,86 +2080,86 @@ msgstr "" "beim Listen oder Extrahieren jedes Verzeichnis auflisten, dass nicht den " "Suchkriterien entspricht" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "Datei- oder Archivnamen nach der Transformation anzeigen" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STIL" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "zusätzliche Zeichen aus ZEICHENKETTE zitieren" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "Zeichen aus ZEICHENKETTE nicht zitieren" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Kompatibilitätsoptionen:" -#: src/tar.c:763 +#: src/tar.c:764 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:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Weitere Optionen:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "möglicherweise schädliche Optionen deaktivieren" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Von den Optionen „-Acdtrux“ ist nur _eine_ erlaubt." -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Kompressionsoptionen schließen sich gegenseitig aus." -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Unbekannter Signalname: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Datumsdatei nicht gefunden" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Ersetze %s für unbekanntes Datumsformat %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Option %s: Behandle Datum „%s“ als %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: Dateiliste schon gelesen" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: gelesener Dateiname enthält ein NULL-Zeichen" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Gültige Argumente für die Option --quoting-style sind:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2150,166 +2167,164 @@ msgstr "" "\n" "*Dieses* „tar“ hat als Voreinstellung:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Ungültige Blockgröße" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Ungültige Bandlänge" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Mehr als ein Datum angegeben." -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" -msgstr "Ungültiger Wert für Sparse-Version" +msgstr "Ungültiger Wert für Sparse-Version (für löchrige Dateien)" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' wird auf dieser Plattform nicht unterstützt" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "Wert für --checkpoint ist keine ganze Zahl" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Ungültige Gruppe" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Ungültige Zugriffsrechte angegeben." -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Ungültige Zahl" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Ungültiger Benutzer" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"Die Option --preserve ist veraltet, benutzen Sie stattdessen --preserve-" +"permissions --preserve-order" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Ungültiger Wert für Recordgröße." -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Die Recordgröße muss ein Vielfaches von %d sein." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Ungültige Elementanzahl" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Nur eine Option --to-command erlaubt" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Fehlgeformtes Dichteargument: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Unbekannte Dicht: „%c“" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[DATEI]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Die alte Option „%c“ benötigt einen Parameter." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ist ohne Dateiliste bedeutungslos" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" "--occurrence kann im angeforderten Operationsmodus nicht benutzt werden" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Mehrere Archivdateien verlangen die Option „-M“." -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental kann nicht mit --newer benutzt werden" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Kann mehrteilige Archive nicht prüfen." -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Kann komprimierte Archive nicht prüfen" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Kann keine mehrteiligen komprimierten Archive verwenden." -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Kann komprimierte Archive nicht aneinanderhängen" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option kann nur mit POSIX-Archiven benutzt werden" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "Teillänge kann nicht unter der Recordgröße liegen" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "--preserve-order ist nicht kompatibel mit --listed-incremental" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Anlegen eines leeren Archivs wird feige verweigert." -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Die Optionen „-Aru“ sind nicht kompatibel mit „-f -“." -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Eine der Optionen „-Acdtrux“ ist notwendig." -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Beende mit Fehlerstatus aufgrund vorheriger Fehler" #: src/update.c:86 #, c-format @@ -2581,12 +2596,12 @@ msgstr "stat(%s) fehlgeschlagen" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "Dateilänge %lu verlangt, tatsächlich %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "erzeugte Datei ist nicht löchrig" #: tests/genfile.c:353 #, c-format @@ -2679,9 +2694,9 @@ msgstr "--stat erfordert Dateinamen" 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" +#~ 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?" # Was ist hier genau gemeint? ke #~ msgid "Error exit delayed from previous errors" diff --git a/po/el.gmo b/po/el.gmo index 54e2810..d06399d 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 7422af6..331e1dc 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -115,11 +115,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -319,11 +319,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -378,7 +378,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -481,6 +481,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Αναφορά σφαλμάτων στο .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -518,15 +540,6 @@ msgstr "" " --version Εμφάνιση πληροφοριών έκδοσης.\n" " --help Εμφάνιση αυτής της βοήθειας.\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Αναφορά σφαλμάτων στο .\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -552,104 +565,104 @@ msgstr "Πρόωρο τέλος αρχείου" msgid "Garbage command" msgstr "Εντολή απορριμμάτων" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Συνολικά byte που γράφτηκαν: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Συνολικά byte που γράφτηκαν: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(σωλήνωση)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Άκυρη τιμή για record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Δεν δόθηκε όνομα αρχειοθήκης" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "" "Δεν είναι δυνατή η επαλήθευση των κανονικών εισόδων/εξόδων της αρχειοθήκης" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αρχειοθηκών" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Στην αρχή της ταινίας, τερματισμός τώρα" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Πάρα πολλά σφάλματα, τερματισμός" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: περιέχει άκυρο αριθμό τόμου" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Υπερχήλιση αριθμού τόμου" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Προετοίμασε τον τόμο #%d για %s και πάτα το πλήκτρο επιστροφής γραμμής" -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF (Τέλος Αρχείου) ενώ η απάντηση του χρήστη αναμενότανε" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ΠΡΟΕΙΔΟΠΟΊΗΣΗ: Η αρχειοθήκη είναι ημιτελής" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -661,71 +674,71 @@ msgstr "" " ! Παραγωγή νέου υπό-φλοιού\n" " ? Εκτύπωση αυτής της λίστας\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Κανένας νέος τόμος; έξοδος\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "`%s' η εντολή απέτυχε" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s είναι το εσφαλμένο μέγεθος (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Αυτός ο τόμος είναι εκτός συνέχειας" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Η αρχειοθήκη δεν έχει ετικέτα για ταίριασμα %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Ο τόμος %s δεν ταιριάζει %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -740,7 +753,7 @@ msgstr[1] "Δυνατή μόνο η ανάγνωση %lu από %lu byte" msgid "Contents differ" msgstr "Τα περιεχόμενα διαφέρουν" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" @@ -858,7 +871,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -887,7 +900,7 @@ msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν απο msgid "%s: File removed before we read it" msgstr "%s: Το αρχείο απομακρύνθηκε πριν το διαβάσουμε" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -982,124 +995,124 @@ msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s" msgid "Error is not recoverable: exiting now" msgstr "Το σφάλμα δεν είναι επανορθώσιμο: τερματισμός τώρα" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Ο κατάλογος έχει μετονομαστεί" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Ο κατάλογος έχει μετονομαστεί" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Ο κατάλογος είναι καινούριος" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Άκυρη ένδειξη χρόνου" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Άκυρη κατάσταση δόθηκε σε επιλογή" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Άκυρος αριθμός συσκευής" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Άκυρος αριθμός i-κόμβου" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Δεν είναι δυνατή η δέσμευση μνήμης για τον συντελεστή ομαδοποίησης %d" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: το αρχείο είναι σε διαφορετικό σύστημα αρχείων; δεν αποθηκεύτηκε" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Διαγραφή %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Δεν είναι δυνατή η απομάκρυνση" @@ -1325,87 +1338,87 @@ msgstr "" "διαφορετικά\n" " never, simple πάντα κάνε απλά αντίγραφα\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Μη αναμενόμενο EOF (Τέλος Αρχείου) στην αρχειοθήκη" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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,572 +1426,577 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Σφάλμα κατά την εγγραφή στην κανονική έξοδο" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Δεν είναι δυνατή η επαλήθευση πολλαπλών αρχειοθηκών" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Συγκρουόμενες επιλογές διαμόρφωσης αρχειοθήκης" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Συγκρουόμενες επιλογές συμπίεσης" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Δεν είναι δυνατή η τροποποίηση του τρέχοντος καταλόγου" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Απομακρύνονται τα αρχικά `%.*s' από τα ονόματα των μελών" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "Ο τόμος %s δεν ταιριάζει %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1986,281 +2004,275 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Ίσως δεν καθορίσατε παραπάνω από μία επιλογή `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Συγκρουόμενες επιλογές συμπίεσης" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " άγνωστος τύπος αρχείου %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Το αρχείο ημερομηνίας δεν βρέθηκε" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Αντικατάσταση %s για άγνωστη διαμόρφωση ημερομηνίας %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: το αρχείο είναι η αρχειοθήκη; δεν αποθηκεύτηκε" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Άκυρος συντελεστής ομαδοποίησης" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Άκυρο μέγεθος ταινίας" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Παραπάνω από ένα όριο ημερομηνίας" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Άκυρη ομάδα" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Άκυρη κατάσταση δόθηκε σε επιλογή" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Άκυρος αριθμός i-κόμβου" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Άκυρος ιδιοκτήτης" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Άκυρο μέγεθος εγγραφής" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Το μέγεθος της εγγραφής πρέπει να είναι πολλαπλάσιο του %d." -#: src/tar.c:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "Άκυρο μέγεθος ταινίας" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "" "Οι επιλογές `-[0-7][lmh]' δεν υποστηρίζονται από *αυτήν* την εντολή tar" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Παλιά επιλογή `%c' απαιτεί όρισμα." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Πολλαπλά αρχεία αρχειοθηκών απαιτούν την επιλογή `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Δεν είναι δυνατός ο συνδυασμός --listed-incremental με --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Δεν είναι δυνατή η επαλήθευση πολλαπλών αρχειοθηκών" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Δεν είναι δυνατή η επαλήθευση των συμπιεσμένων αρχειοθηκών" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Δεν είναι δυνατή η χρήση πολλαπλών συμπιεσμένων αρχειοθηκών" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αρχειοθηκών" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Αρνούμαι δειλά στη δημιουργία μίας κενής αρχειοθήκης" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Οι επιλογές `-Aru' δεν είναι συμβατές με `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Πρέπει να καθορίσεις μία από τις επιλογές `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2614,6 +2626,11 @@ msgstr "--Κατακερματισμένα ονόματα αρχείων--\n" msgid "too many arguments" msgstr "" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "" +#~ "Προειδοποίηση: η -I επιλογή δεν υποστηρίζεται; ίσως εννοούσατε την -j ή " +#~ "την -T;" + #~ msgid "block size" #~ msgstr "μέγεθος μπλοκ" diff --git a/po/es.gmo b/po/es.gmo index 5284df9..165134f 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 52d1cd6..e057a55 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 #, fuzzy msgid "give this help list" msgstr "Da esta lista de ayuda" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 #, fuzzy msgid "give a short usage message" msgstr "Da un mensaje de uso corto" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NOMBRE" @@ -131,11 +131,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 #, fuzzy msgid "print program version" msgstr "Muestra la versión del programa" @@ -336,11 +336,11 @@ msgstr "Se sustituye `.' por un objetivo vac #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -395,7 +395,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -492,6 +492,44 @@ msgid "" "%s, %s, and others.\n" msgstr "" +# Por favor, no me digáis cómo se traduce bug. +# Gerardo lo ha visto traducido en un libro como "pulgas", y yo +# lo he visto como "chinche" en la "Investigación y Ciencia". +# Está claro que así no vamos a ninguna parte. +# Yo diría simplemente `fallos [ocultos]'. Es lo que significa, en realidad, +# en el contexto informático, razones históricas aparte de bichos anidando +# al calorcito de los tubos de vacío de los primeros computadores. gerardo +# De "ocultos" nada... Este vamos a dejarlo, ¿vale? sv +# Tú mandas, pero ¿cómo que de ocultos nada? Si no fueran ocultos, el progra- +# ma no vería la luz aún, ¿no? Pero observa que he puesto el `ocultos' entre +# corchetes. Yo pondría "bug -> fallo" simplemente. Comunicar fallos a... gerardo +# ¿Que no vería la luz si no fueran ocultos? Ja, ja, ja, ja... +# Mira por ejemplo en http://nl.debian.org/Bugs. +# ¿No tendría sentido catalogarlos entonces? +# +# Véase "A Bug's life". +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Comunicar bichos a <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -528,31 +566,6 @@ msgstr "" " --version Muestra la versión.\n" " --help Muestra esta ayuda.\n" -# Por favor, no me digáis cómo se traduce bug. -# Gerardo lo ha visto traducido en un libro como "pulgas", y yo -# lo he visto como "chinche" en la "Investigación y Ciencia". -# Está claro que así no vamos a ninguna parte. -# Yo diría simplemente `fallos [ocultos]'. Es lo que significa, en realidad, -# en el contexto informático, razones históricas aparte de bichos anidando -# al calorcito de los tubos de vacío de los primeros computadores. gerardo -# De "ocultos" nada... Este vamos a dejarlo, ¿vale? sv -# Tú mandas, pero ¿cómo que de ocultos nada? Si no fueran ocultos, el progra- -# ma no vería la luz aún, ¿no? Pero observa que he puesto el `ocultos' entre -# corchetes. Yo pondría "bug -> fallo" simplemente. Comunicar fallos a... gerardo -# ¿Que no vería la luz si no fueran ocultos? Ja, ja, ja, ja... -# Mira por ejemplo en http://nl.debian.org/Bugs. -# ¿No tendría sentido catalogarlos entonces? -# -# Véase "A Bug's life". -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Comunicar bichos a <%s>.\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -579,7 +592,7 @@ msgstr "Fin de fichero prematuro" msgid "Garbage command" msgstr "Orden ininteligible" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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" @@ -589,12 +602,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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Bytes escritos en total: %s (%s, %s/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" @@ -603,7 +616,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:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Bytes escritos en total: %s (%s, %s/s)\n" @@ -622,17 +635,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:452 +#: src/buffer.c:454 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:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "El valor de `record_size' no es válido" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "No se ha especificado ningún nombre de archivo" @@ -651,69 +664,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:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "No se puede verificar la entrada/salida estándar" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "El archivo está comprimido. Utilice la opción %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "No se pueden actualizar archivos comprimidos" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Al principio de la cinta, se terminará ahora" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Demasiados errores, abandono" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek no paró en los límites de un registro" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contiene un número de volumen inválido" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Desbordamiento en el número de volumen" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare el volumen #%d para %s y pulse intro: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "" "Se encontró un final de fichero mientras se esperaba respuesta del usuario" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ATENCIÓN: El archivo está incompleto" @@ -745,7 +758,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:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -758,12 +771,12 @@ msgstr "" " ! Lanza un subshell\n" " ? Muestra esta ayuda\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" @@ -774,35 +787,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:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "No hay volumen nuevo; finalizando.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "La orden `%s' falló" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s no continúa en este volumen" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s tiene un tamaño erróneo (%s != %s + %s)" @@ -822,7 +835,7 @@ 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:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volumen está fuera de secuencia" @@ -833,17 +846,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:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "El archivo no está etiquetado para que coincida con %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "El volumen %s no coincide con %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, fuzzy, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -855,7 +868,7 @@ msgstr "" # 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 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "El fin del archivo %s no está en un límite de bloque" @@ -871,7 +884,7 @@ msgstr[1] "S msgid "Contents differ" msgstr "El contenido es distinto" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fin de fichero inesperado en el archivo" @@ -1025,7 +1038,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 #, fuzzy msgid "contents not dumped" msgstr " (memoria volcada)" @@ -1072,7 +1085,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:535 +#: src/create.c:1591 src/incremen.c:543 #, fuzzy msgid "directory not dumped" msgstr "%s: contiene una marca de directorio caché; no se vuelca" @@ -1182,127 +1195,127 @@ msgstr "%s: No se puede renombrar a %s" msgid "Error is not recoverable: exiting now" msgstr "El error no es recuperable: salida ahora" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: El directorio ha sido renombrado" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: El directorio ha sido renombrado" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: El directorio es nuevo" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Marca de tiempo inválida" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Se ha especificado un modo no válido en la opción" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Número de dispositivo inválido" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Número de nodo-i inválido" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 #, fuzzy msgid "Read error in snapshot file" msgstr "Error de lectura en %s" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de fichero inesperado en el archivo" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Argumento de densidad mal formado: '%s'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Argumento de densidad mal formado: '%s'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, 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:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: No se puede borrar" @@ -1573,73 +1586,73 @@ msgstr "" " en otro caso\n" " never, simple siempre hace copias de seguridad simples\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Modo principal de operación:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "lista el contenido de un archivo" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "extrae ficheros de un archivo" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "crea un nuevo archivo" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "encuentra las diferencias entre un archivo y el sistema de ficheros" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "añade ficheros al final de un archivo" -#: src/tar.c:386 +#: src/tar.c:385 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:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "añade ficheros tar a un archivo" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "borra del archivo (¡no en cintas magnéticas!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Modificadores de operación:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "maneja ficheros dispersos de forma eficiente" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "maneja el formato GNU antiguo de respaldo incremental" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FICHERO" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "maneja el nuevo formato GNU de respaldo incremental" @@ -1650,16 +1663,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:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "no sale con estado distinto de cero cuando hay ficheros ilegibles" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NÚMERO" -#: src/tar.c:411 +#: src/tar.c:410 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1673,202 +1686,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:417 +#: src/tar.c:416 #, fuzzy msgid "archive is seekable" msgstr "El archivo admite `seek'" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "intenta verificar el archivo después de escribirlo" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "borra los ficheros después de añadirlos al archivo" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "no reemplaza ficheros que existan al extraer" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "sobreescribe los ficheros que existan al extraer" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "borra cada fichero antes de extraer sobre él" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "vacía jerarquías antes de extraer directorios" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "conserva los metadatos de los directorios que existan" -#: src/tar.c:447 +#: src/tar.c:446 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "sobreescribe los ficheros que existan al extraer" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "extrae los ficheros a la salida estándar" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "ORDEN" -#: src/tar.c:458 +#: src/tar.c:457 #, fuzzy msgid "pipe extracted files to another program" msgstr "extrae los ficheros a la salida estándar" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Manejo de los atributos del fichero:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "fuerza NOMBRE como propietario de los ficheros que se añaden" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "fuerza NOMBRE como grupo para los ficheros que se añaden" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "FECHA-O-FICHERO" -#: src/tar.c:474 +#: src/tar.c:473 #, 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "CAMBIOS" -#: src/tar.c:476 +#: src/tar.c:475 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:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "no extrae la fecha de modificación del fichero" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "intenta extraer los ficheros con el mismo propietario" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "extrae los ficheros como usted mismo" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "utiliza siempre números para los nombres de usuarios/grupos" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "ordena los nombres que se extraen para que coincidan con el archivo" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "lo mismo que -p y -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Selección de dispositivo y opciones:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIVO" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "utiliza un archivo o el dispositivo ARCHIVO" -#: src/tar.c:515 +#: src/tar.c:514 #, 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "utiliza la ORDEN rmt dada en vez de rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "utiliza la ORDEN remota en vez de rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "especifica la unidad y la densidad" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "crea/lista/extrae un archivo multivolumen" @@ -1882,38 +1895,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:539 +#: src/tar.c:538 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:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "ejecuta un script al final de cada cinta (implica -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "usa/actualiza el número de volumen en FICHERO" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Bloques en los dispositivos:" -#: src/tar.c:551 +#: src/tar.c:550 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:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOQUES x 512 bytes por registro" -#: src/tar.c:554 +#: src/tar.c:553 #, fuzzy msgid "NUMBER of bytes per record, multiple of 512" msgstr "TAMAÑO bytes por registro, múltiplo de 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" "no tiene en cuenta los bloques convertidos en ceros dentro de un archivo " @@ -1928,7 +1941,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:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "rehace los bloques conforme se lee (para tuberías de 4.2BSD)" @@ -1937,70 +1950,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:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Selección del formato de archivo:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMATO" -#: src/tar.c:566 +#: src/tar.c:565 #, fuzzy msgid "create archive of the given format" msgstr "crea un archivo en el formato dado." -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMATO es uno de los siguientes:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "formato tar V7 antiguo" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "formato GNU de tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "formato GNU tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formato POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formato POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 #, fuzzy msgid "same as pax" msgstr "Lo mismo que pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "lo mismo que --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "lo mismo que --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "palabra[[:]=valor][,palabra[[:]=valor], ...]" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "palabras clave de control de pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEXTO" -#: src/tar.c:589 +#: src/tar.c:588 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " @@ -2009,88 +2022,95 @@ msgstr "" "crea un archivo con nombre de volumen NOMBRE. En el momento de listar/" "extraer, utiliza TEXTO como patrón expandible" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Opciones de compresión en conflicto" -#: src/tar.c:596 +#: src/tar.c:595 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "No se puede escribir al programa de compresión" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" -msgstr "" +#: src/tar.c:597 +#, fuzzy +msgid "do not use archive suffix to determine the compression program" +msgstr "No se puede escribir al programa de compresión" -#: src/tar.c:601 +#: src/tar.c:600 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:603 +#: src/tar.c:602 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:607 +#: src/tar.c:606 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:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "filtra el arhivo a través de gzip" # FIXME: Decir al autor que ponga el "itself". sv -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "filtra el arhivo a través de gzip" +# FIXME: Decir al autor que ponga el "itself". sv #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "filtra el arhivo a través de gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "filtra a través de PROG (debe aceptar -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Selección del fichero local:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "DIR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "cambia al directorio DIR" -#: src/tar.c:626 +#: src/tar.c:627 #, 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:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T lee nombres terminados en nulo, desactiva -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" @@ -2099,111 +2119,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:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "PATRÓN" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "excluye ficheros, dados como un PATRÓN" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "excluye los patrones listados en FICHERO" -#: src/tar.c:640 +#: src/tar.c:641 #, 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:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:648 +#: src/tar.c:649 #, 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:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:653 +#: src/tar.c:654 #, fuzzy msgid "exclude directories containing FILE" msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "evita descender automáticamente en los directorios" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "permanece en el sistema de ficheros locales al crear el archivo" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "opera recursivamente sobre los directorios (por omisión)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "no elimina la `/' inicial de los nombres de ficheros" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "NOMBRE-DE-MIEMBRO" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "comienza por el miembro NOMBRE-DE-MIEMBRO dentro del archivo" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "FECHA" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "compara la fecha y hora solamente cuando cambian los datos" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "se hace un respaldo antes de borrar, escoja el CONTROL de versión" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "CADENA" -#: src/tar.c:678 +#: src/tar.c:679 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -2213,97 +2233,97 @@ msgstr "" "que se\n" "cambie con la variable de entorno SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 #, 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 #, fuzzy msgid "ignore case" msgstr "la exclusión no distingue mayúsculas de minúsculas" -#: src/tar.c:699 +#: src/tar.c:700 #, fuzzy msgid "patterns match file name start" msgstr "" "los patrones de exclusión encajan con el comienzo del nombre del fichero" -#: src/tar.c:701 +#: src/tar.c:702 #, 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:703 +#: src/tar.c:704 #, fuzzy msgid "case sensitive matching (default)" msgstr "la exclusión distingue mayúsculas de minúsculas (por omisión)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "los comodines de patrones de exclusión no encajan con '/'" -#: src/tar.c:711 +#: src/tar.c:712 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "" "los comodines de los patrones de exclusión encajan con '/' (por omisión)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Salida informativa:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "lista los ficheros procesados detalladamente" -#: src/tar.c:721 +#: src/tar.c:722 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "muestra mensajes de progreso cada 10 registros" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "muestra un mensaje si no se vuelcan todos los enlaces" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2311,28 +2331,28 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "muestra las fechas de modificación de los ficheros en UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "envía la salida detallada a FICHERO" -#: src/tar.c:738 +#: src/tar.c:739 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:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "pide confirmación para cada acción" -#: src/tar.c:743 +#: src/tar.c:744 #, fuzzy msgid "show tar defaults" msgstr "Muestra los valores predeterminados de tar" -#: src/tar.c:745 +#: src/tar.c:746 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " @@ -2341,31 +2361,31 @@ msgstr "" "Cuando se lista o extrae, lista cada directorio que no coincida con el " "criterio de búsqueda" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Opciones de compatibilidad:" -#: src/tar.c:763 +#: src/tar.c:764 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" @@ -2374,58 +2394,58 @@ msgstr "" "al crear, lo mismo que --old-archive. Al extraer, lo mismo que --no-same-" "owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Otras opciones:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Opciones de compresión en conflicto" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " tipo de fichero desconocido %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "No se encontró la fecha del fichero" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Sustituyendo %s por el formato de fecha desconocido %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, 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:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: el fichero es el propio archivo; no se vuelca" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2433,15 +2453,11 @@ msgstr "" "\n" "Las opciones predeterminadas de *esta* versión de tar son:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Factor de bloqueo inválido" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Longitud de cinta inválida" @@ -2451,104 +2467,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:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Se ha especificado más de una fecha tope" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Grupo inválido" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Se ha especificado un modo no válido en la opción" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Número inválido" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Propietario inválido" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "El tamaño del registro es inválido" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Número inválido de elementos" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "Argumento de densidad mal formado: '%s'" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Densidad desconocida: '%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FICHERO]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "La opción antigua `%c' requiere un argumento" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence no tiene sentido sin una lista de ficheros" -#: src/tar.c:2241 +#: src/tar.c:2240 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:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Los archivos múltiples requieren la opción `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "No se puede combinar --listed-incremental con --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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)" @@ -2557,49 +2573,49 @@ msgstr[0] "" msgstr[1] "" "%s: La etiqueta de volumen es demasiado larga (el límite es %lu bytes)" -#: src/tar.c:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "No se pueden verificar archivos multivolumen" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "No se pueden verificar archivos comprimidos" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "No se pueden utilizar archivos multivolumen comprimidos" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "No se pueden actualizar archivos comprimidos" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option solamente se puede usar en archivos POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 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:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Rechazo cobarde a crear un archivo vacío" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Las opciones `-Aru' son incompatibles con `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Debe especificar una de las opciones `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2985,6 +3001,9 @@ msgstr "--Nombres de fichero modificados--\n" msgid "too many arguments" msgstr "" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "Atención: no se admite la opción -I; ¿no será -j o -T?" + #~ msgid "block size" #~ msgstr "tamaño del bloque" diff --git a/po/et.gmo b/po/et.gmo index e144ec2..34607b3 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 70878e4..6df28e5 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "näita seda abiinfot" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "näita lühikest kasutamise õpetust" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: 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:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "oota SEK sekundeid (vaikimisi 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "esita programmi versioon" @@ -311,11 +311,11 @@ msgstr "Kasutan t #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -370,7 +370,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -467,6 +467,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Teated vigadest saatke palun aadressil <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Sisendi sõne on liiga pikk" @@ -503,15 +525,6 @@ msgstr "" " --version Väljasta versiooniinfo.\n" " --help Väljasta abiinfo.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Teated vigadest saatke palun aadressil <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Otsimise indeksi viga" @@ -536,104 +549,104 @@ msgstr "Ootamatu faili l msgid "Garbage command" msgstr "Rämpskäsk" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Baite kirjutatud kokku" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Baite loetud kokku" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Baite kirjutatud kokku: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(toru)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Kirje suuruse väärtus on vigane" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Arhiivi nime pole" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Ei saa kontrollida sisend/väljund arhiive" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiiv on tihendatud. Kasutage võtit %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Ei saa uuendada pakitud arhiive" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Lindi alguses, lõpetan töö" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Liig palju vigu, jätan töö pooleli" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ei peatunud kirje piiril" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sisaldab vigast volüümi numbrit" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Volüümi number on liiga suur" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF kasutaja vastuse asemel" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "HOIATUS: Arhiiv pole täielik" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -644,65 +657,65 @@ msgstr "" " q Katkesta tar\n" " y või reavahetus Jätka\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Loo alamshell\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Väljasta see info\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Pole uus volüüm; lõpetan töö.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Puudub faili nimi. Proovige uuesti.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Vigane sisend. ? annab abiinfot.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "%s käsklus sai vea" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s ei jätku sellel volüümil" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s on vale suurusega (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, 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:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiivi märgend ei sobi `%s'" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Volüüm `%s' ei sobi volüümiga `%s'" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -710,7 +723,7 @@ msgstr "" "%s: faili nimi on GNU mitmevolüümi päisesse salvestamiseks liiga pikk, " "lühendan" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek ei peatunud kirje piiril" @@ -726,7 +739,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Ootamatu arhiivi lõpp" @@ -844,7 +857,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -873,7 +886,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:535 +#: src/create.c:1591 src/incremen.c:543 #, fuzzy msgid "directory not dumped" msgstr "%s: sisaldab vahemälu kataloogi lipikut; ei salvesta" @@ -968,122 +981,122 @@ msgstr "%s ei msgid "Error is not recoverable: exiting now" msgstr "Ületamatu tõrge: lõpetan töö" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Kataloog %s on ümber nimetatud" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Kataloog on ümber nimetatud" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Kataloog on uus" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Vigane ajatempel" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Vigane muutmise aeg (sekundid)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Vigane muutmise aeg (nanosekundid)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Vigane seadmenumber" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Vigane i-kirje number" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Snapshoti faili lugemisel leiti liiga pikk väli" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Snapshoti failist lugemise viga" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Ootamatu snapshoti faili lõpp" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Snapshoti failis on väljal ootamatu väärtus" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Puudub kirje lõpetaja" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Inkrementaalse faili vorming on vigane" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Mittetoetatud inkrementaalse vormingu versioon: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Vigane taastamise kataloog: eeldasin '%c', sain %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Vigane taastamise kataloog: dubleeritud 'X'" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Vigane taastamise kataloog: tühi nimi 'R' väljal" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Vigane taastamise kataloog: 'R' ei ole 'T' ees" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Vigane taastamise kataloog: tühi nimi 'T' väljal" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Vigane taastamise kataloog: 'X' ei kasutata" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Vormiga %s ei saa ajutist kataloogi luua" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ei puhasta kataloogi: stat ebaõnnestus" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: kataloog on teisel seadmel; ei puhasta" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Kustutan %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei saa eemaldada" @@ -1301,86 +1314,86 @@ msgstr "" " nil, existing nummerdatud kui koopiad on nummerdatud, muidu lihtne\n" " never, simple tee ainult lihtne koopia\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Põhiline töö:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "näita arhiivi sisukorda" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "taasta failid arhiivist" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "loo uus arhiiv" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "otsi arhiivi ja failisüsteemi erinevusi" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "lisa failid arhiivi lõppu" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "lisa arhiivi ainult failid uuemad kui arhiivis" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "lisa tar failid arhiivi" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "kustuta arhiivist (mitte magnetlindilt!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "testi arhiivi volüümi märgendit ja lõpeta töö" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Töö täpsustamine:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "tööta aukudega failidega efektiivsemalt" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "PÕHI[.ALAM]" -#: src/tar.c:403 +#: src/tar.c:402 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:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "käsitle vana GNU vormingus inkrementaalset koopiat" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FAIL" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "käsitle uue GNU vormingu inkrementaalset koopiat" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "ära lõpeta loetamatute failide korral veakoodiga" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:411 +#: src/tar.c:410 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,116 +1406,116 @@ msgstr "" "antud\n" "käsureal või võtmega -T. Vaikimisi N on 1." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "arhiiv on positsioneeritav" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Ülekirjutamise juhtimine:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "kontrolli arhiivi peale arhiivi kirjutamist" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "kustuta failid peale arhiveerimist" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "olemasolevaid faile taastamisel üle ei kirjuta" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "kirjuta olemasolevad failid üle" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "kustuta fail enne taastamist" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "kustuta hierarhia enne kataloogi taastamist" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "säilita olemasolevate kataloogide metainfo" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "taastamisel kirjuta olemasolevate kataloogide metainfo üle (vaikimisi)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Vali väljundvoog:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "taasta failid standardväljundisse" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KÄSK" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "taasta failid läbi toru teise programmi" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "ignoreeri alamprotsesside lõpetamise koode" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "käsitle alamprotsesside nullist erinevaid lõpetamise koode veana" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Faili atribuutide käsitlemine:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "kasuta NIMEe kui lisatud failide omanikku" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "kasuta NIMEe kui lisatud failide gruppi" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "KUUP-VÕI-FAIL" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "sea lisatud failide muutmise ajaks KUUP-VÕI-FAIL" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "MUUTUSED" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "kasuta lisatud failidel sümbol moodi MUUTUSED" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "MEETOD" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1512,27 +1525,27 @@ msgstr "" "lugemist (METHOD='replace'; vaikimisi) või ei muuda kasutamise aega üldse " "(METHOD='system')" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "ära taasta faili muutmise aega" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "säilita taastamisel failide omanikud" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "taasta failid enda õigustes" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "kasuta kasutaja/grupp numbreid" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "taasta ka info failide õigustest (vaikimisi superkasutaja korral)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1540,154 +1553,154 @@ msgstr "" "õiguste taastamisel kasuta kasutaja umask väärtust (vaikimisi " "tavakasutajatel)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "taasta failid arhiveerimis järjekorras" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "sama, kui -p ja -s" -#: src/tar.c:502 +#: src/tar.c:501 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:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "katkesta --delay-directory-restore võtme mõju" -#: src/tar.c:510 +#: src/tar.c:509 #, fuzzy msgid "Device selection and switching:" msgstr "Seadme valik ja vahetamine:\n" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARHIIV" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "kasuta arhiivi faili või seadet ARHIIV" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "arhiivi fail on lokaalne isegi kui sisaldab koolonit" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "kasuta rmt asemel antud käsku" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "kasuta rsh asemel antud käsku" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "määra seade ja tihedus" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "loo/näita/taasta mitme volüümilisi arhiive" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "vaheta peale NUMBER x 1024 baidi kirjutamist linti" -#: src/tar.c:541 +#: src/tar.c:540 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:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "kasuta/uuenda volüümi numbrit failis FAIL" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Seadme blokkimine:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOKKE" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKKE x 512 baiti kirjele" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMBER baiti kirjele, 512 kordne" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignoreeri null blokke arhiivis (tähistab EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "bloki lugemisel uuesti (4.2BSD torude jaoks)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Arhiivi vormingu valikud:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "VORMING" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "loo arhiiv antud vormingus" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "VORMING on üks järgnevaist:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "vana V7 tar vorming" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU vorming tar <= 1.12 korral" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x vorming" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) vorming" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) vorming" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "sama, kui pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "sama, kui --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "sama, kui --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "võtmesõna[[:]=väärtus][,võtmesõna[[:]=väärtus]...]" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "pax võtmesõnade kasutamine" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1695,191 +1708,196 @@ msgstr "" "loo arhiivi volüümi nimega NIMI. Listingu/taastamise ajal kasuta TEKSTi " "otsingumustrina" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Konfliktsed pakkimisvõtmed" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "filtreeri arhiiv läbi bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "filtreeri arhiiv läbi gzipi" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "filtreeri arhiiv läbi compressi" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "filtreeri arhiiv läbi gzipi" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "filtreeri arhiiv läbi gzipi" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "filtreeri arhiiv läbi gzipi" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "filtreeri läbi programmi (peab lubama võtit -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Lokaalse faili valik:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "KAT" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "mine kataloogi KAT" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "loe taastatavate või varundatavate failide nimed failist NIMI" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T loeb nullidega lõpetatud nimesid, blokeeri -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "eemalda -T võtmega loetud failinimedest kvootimissümbolid (vaikimisi)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "ära eemalda -T võtmega loetud failinimedest kvootimissümboleid" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "MUSTER" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "MUSTRI järgi välistatud failid" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "välistavad mustrid on FAILIS" -#: src/tar.c:640 +#: src/tar.c:641 #, 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:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:648 +#: src/tar.c:649 #, 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:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:653 +#: src/tar.c:654 #, fuzzy msgid "exclude directories containing FILE" msgstr "välista kataloogid, mis on märgitud vahemälu jaoks" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "ära sisene kataloogidesse" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "püsi arhiivi loomise ajal kohalikus failisüsteemis" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "sisene kataloogidesse (vaikimisi)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "ära eemalda faili nimedelt prefiksit `/'" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "järgi nimeviiteid; arhiveeri ja taasta viidatavad failid" -#: src/tar.c:667 +#: src/tar.c:668 #, 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "KOMPONENT" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "alusta arhiivi liikmest KOMPONENT" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "salvesta ainult failid mis on uuemad kui KUUP-VÕI-FAIL" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "KUUPÄEV" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "võrdle kuupäevi ainult kui andmed on muutunud" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "KONTROLL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "loo enne eemaldamist varukoopia, vali versioonikontroll" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "SÕNE" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1887,87 +1905,87 @@ msgstr "" "varunda enne kustutamist, kasuta uut lõppu (vaikimisi '~', kui pole üle " "määratud keskkonnamuutujaga SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Failide nimede muutmine:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "eemalda taastamisel failide nimede algusest NUMBER komponenti" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "AVALDIS" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "kasuta failide nimede muutmiseks sed asendus avaldist" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Failinimede otsimine (mõjutab nii kaasamist, kui välistamist):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "tõstutundetu" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "mustrid alustavad faili nime algusest" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "mustrid toimivad iga / järel (välistamise korral vaikimisi)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "tõstutundlik otsimine (vaikimisi)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "kasuta jokkersümboleid (välistamise korral vaikimisi)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "täht-täheline sõne otsimine" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "jokkerid ei leia '/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "jokkersümbolid leiavad '/' (välistamise korral vaikimisi)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Informatsioon:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "väljasta töödeldavate failide kohta infot" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "anna töö kohta infot iga NUMBER kirje järel (vaikimisi 10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "väljasta teade, kui kõike viiteid pole salvestatud" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAAL" -#: src/tar.c:729 +#: src/tar.c:730 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 +1996,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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "väljasta failide muutmise ajad UTC esituses" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "salvesta täiendav info FAILi" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "näita iga teatega ka arhiivi bloki numbrit" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "küsi iga tegevuse kohta kinnitust" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "näita tar vaikeseadeid" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2006,86 +2024,86 @@ msgstr "" "listingu või taastamise ajal, näita igat kataloogi mis ei vasta " "otsingutingimustele" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "peale teisendamist näita faili või arhiivi nime" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STIIL" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "lisaks kvoodi sõnes näidatud sümbolid" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "keela sõnes toodud sümbolite kvootimine" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Ühilduvuse võtmed:" -#: src/tar.c:763 +#: src/tar.c:764 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:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Muud võtmed:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "blokeeri potentsiaalselt ohtlikud võtmed" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Korraga ainult üks võtmetest `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Konfliktsed pakkimisvõtmed" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Tundmatu signaali nimi: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Kuupäeva fail puudub" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Kasutan %s tundmatu ajaformaadi %s asemel" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Võti %s: Käsitlen aega `%s' kui %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: failide nimekiri on juba loetud" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: loetud faili nimi sisaldab sümbolit nul" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Võtmega --quoting-style on lubatud järgnevad argumendid:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2093,162 +2111,158 @@ msgstr "" "\n" "*See* tar kasutab vaikimisi:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Vigane blokkimisfaktor" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Vigane lindi pikkus" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Rohkem kui üks etteantud aeg" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Vigane aukudega faili versiooni väärtus" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ei ole sellel platvormil toetatud" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "--checkpoint väärtus ei ole täisarv" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Vigane grupp" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Võtmega anti vigane mood" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Vigane number" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Vigane omanik" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Vigane kirje suurus" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Kirje suurus peab olema %d kordne." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Vigane elementide arv" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Lubatud on ainult üks --to-command võti" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Vigane tiheduse argument: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Tundmatu tihedus: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FAIL]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Vana võti `%c' nõuab argumenti." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ei oma failide nimekirjata mõtet" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence ei saa valitud tööre¸iimil kasutada" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Mitme arhiivifaili kasutamine nõuab võtit `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental ja --newer ei saa koos kasutada" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Ei suuda kontrollida mitme volüümilisi arhiive" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Ei saa kontrollida pakitud arhiive" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Ei saa kasutada mitme volüümilisi pakitud arhiive" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Tihendatud arhiive ei saa ühendada" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option saab kasutada ainult POSIX arhiividega" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Ega ikka ei tee küll tühja arhiivi" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Võtmeid `-Aru' ei saa kasutada võtmega `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Peab kasutama vähemalt üht võtmetest `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2605,6 +2619,10 @@ msgstr "--stat n msgid "too many arguments" msgstr "liiga palju argumente" +#~ 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?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "katkesta --delay-directory-restore võtme mõju" diff --git a/po/eu.gmo b/po/eu.gmo index 7dc93c1..6792f3f 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index c29f56a..d0de296 100644 --- a/po/eu.po +++ b/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: tar-1.15.91-eu\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2006-12-13 19:52+0100\n" "Last-Translator: Mikel Olasagasti \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "laguntza zerrenda hau eman" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "erabilera mezu labur bat eman" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: 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:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "SEG segundu gelditu (lehenetsia 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "programa bertsioa bistarazi" @@ -314,11 +314,11 @@ msgstr "`.' lotura gogor helburu hutsegatik aldatzen" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -373,7 +373,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -470,6 +470,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Erroreen berri <%s>-ra eman.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Sarrera kate luzeegia" @@ -506,15 +528,6 @@ msgstr "" " --version Bertsio argibideak eman.\n" " --help Laguntza hau eman.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Erroreen berri <%s>-ra eman.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Seek offset errorea" @@ -539,102 +552,102 @@ msgstr "Fitxategi amaiera azkarregia" msgid "Garbage command" msgstr "Zabor komandoa" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Idatziriko byte-ak guztira" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Irakurritako byte-ak guztira" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Ezabaturiko byte-ak guztira: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(tutua)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "balio baliogabea record_size-rentzat" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Ez da fitxategi izenik eman" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Ezin da sarrera/irteera estandar fitxategia egiaztatu" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Fitxategia konprimiturik dago. %s aukera erabili" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Ezin dira konprimituriko fitxategiak eguneratu" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Zintaren hasieran, uzten" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Errore gehiegi, uzten" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: bolumen zenbaki baliogabea du" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Bolumen zenbaki gainezkatzea" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "#%d bolumena %s -rako prestatu eta enter sakatu: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Fitxategi amaiera erabiltzaile erantzuna espero zenean" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "Oharra: Paketea ez dago osaturik" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -645,72 +658,72 @@ msgstr "" " q tar utzi\n" " y edo intro Ekintza jarraitu\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Azpishell bat sortu\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Zerrenda hau inprimatu\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Ez dago bolumen berririk; uzten.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Ez da fitxategi izenik ezarri. Berriz saiatu.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "SArrera baliogabea. ? idatzi laguntzarako.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "%s komandoak huts egin du" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s ez da bolumen honen jarraipena" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s okerreko tamaina da (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Bolumen hau sekuentziatik kanpo dago" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "%s bolumena ez da %s-ren pareko" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, 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 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -725,7 +738,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Esperogabeko Fitxategi amaiaera paketean" @@ -843,7 +856,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -872,7 +885,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:535 +#: src/create.c:1591 src/incremen.c:543 #, fuzzy msgid "directory not dumped" msgstr "%s: katxe direktorioa marka bat du; ez da irauliko" @@ -968,127 +981,127 @@ msgstr "Ezin da %s %s-ra berrizendatu" msgid "Error is not recoverable: exiting now" msgstr "Errorea berreskura ezina da: irteten" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktorioa %s-tik berrizendatua izan da" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktorioa berrizendatua izan da" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktorioa berria da" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "denbora marka baliogabea" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Eraldaketa denbora (segundu) baliogabea" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Eraldaketa denbora (nanosegundu) baliogabea" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "gailu zenbaki baliogabea" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Inodo zenbaki baliogabea" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Eremu luzeegia snapshot fitxategia irakurtzerakoan" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 #, fuzzy msgid "Read error in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Gordetze amaiera falta da" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Fitxategi inkremental formatu okerra" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, fuzzy, c-format msgid "Unsupported incremental format version: %" msgstr "Onartugabeko inkremental formatu bertsioa: %d" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, 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:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' bikoizturik" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'R'-en" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: 'T' ez doa 'R' atzean" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'T'-en" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' ez da inoiz erabili" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ezin da aldiroko direktorioa sortu %s txantiloia erabiliaz" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ez da direktorioa garbituko: ezin da egoera eskuratu" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ezabatzen\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ezin da ezabatu" @@ -1333,87 +1346,87 @@ msgstr "" "erabili\n" " never, simple beti babeskopia sinpleak egin\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Ekintza nagusi modua:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "pakete baten edukiak zerrendatu" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "pakete batetako fitxategiak atera" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "pakete berri bat sortu" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "paketea eta fitxategi sistema arteko ezberdintasunak bilatu" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "fitxategiak paketearen amaieran gehitu" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" "paketean dauden kopiak baino berriagoak diren fitxategiak bakarrik gehitu" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "gehitu tar fitxategiak pakete batetara" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "paketetik ezabatu (ez mag zintetan!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "pakete bolumen etiketa egiaztatu eta irten" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Ekintza aldagaiak:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "sakabanatutako fitxategiak egoki kudeatu" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "GNU basbeskopia inkremenetal formatu zaharra kudeatu" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FITXATEGIA" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "GNU basbeskopia inkremenetal formatu berria kudeatu" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "ZENBAKIA" -#: src/tar.c:411 +#: src/tar.c:410 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,148 +1434,148 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "paketeak `seek' onartzen du" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 #, fuzzy msgid "Overwrite control:" msgstr "Gainidazketa kontrola:\n" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "fitxategia egiaztatzen saiatu idatzi aurretik" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "ezabatu fitxategiak paketera gehitu aurretik" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "ez ordezkatu dauden fitxategiak ateratzerakoan" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "gainidatzi dauden fitxategiak ateratzerakoan" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "dauden direktorioen metadata mantendu" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "dauden direktorioen metadata gainidatzi ateratzerakoan (lehenetsia)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Irteera korrontea hautatu:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "fitxategiak irteera estandarrera atera" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMANDOA" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "bideratu ateratako fitxategiak beste programa batetara" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "alde batetara utzi semeen irteera kodeak" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "zero ez diren semeen irteera kodeekin errore bat bezala jokatu" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Fitxategi atributu kudeaketa:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "indartu IZENA jabe bezala gehituriko fitxategientzat" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "indartu IZENA talde bezala gehituriko fitxategientzat" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATA-EDO-FITXATEGIA" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "ALDAKETAK" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "indartu (sinbolikoa) modu ALDAKETAK gehituriko lerroentzat" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METODOA" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "ez atera fitxategi eraldaketa data" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "jabe berdinaren fitxategiak ateratzen saiatu" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "atera fitxategiak zure kabuz" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "beti erabili zenbakiak erabiltzaile/talde izenen ordez" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "fitxategi baimenei buruzko argibideak atera (lehenetsia root " "erabiltzailearentzat)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1570,439 +1583,444 @@ msgstr "" "erabiltzailearen umask-a erabili paketetik baimenak ateratzerakoan " "(lehenetsia erabiltzaile arruntentzat)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "-p eta -s bikotearen berdina" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore aukeraren eragina ezeztatu" -#: src/tar.c:510 +#: src/tar.c:509 #, fuzzy msgid "Device selection and switching:" msgstr "Gailu hautapen eta aldaketa:\n" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "PAKETEA" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "pakete fitxategia edo gailu PAKETEA erabili" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "pakete fitxategi lokala da nahiz bi puntu izan" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "Emandako rmt KOMANDOA erabili rmt ordez" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "Urruneko KOMANDOA erabili rsh ordez" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "Gailu eta dentsitatea ezarri" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "sortu/zerrendatu/atera bolumen-anitzeko paketea" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "zinta aldatu ZENBAKIA x 1024 byte idatzi ondoren" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "scipt-a abiarazi zinta bakoitzaren amaieran (-M behar du)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "erabili/eguneratu FITXATEGI bolumen zenbakia" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Gailu blokeak:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOKE" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKE x 512 byte grabazio bakoitzeko" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "grabazio bakoitzeko byte ZENBAKIA, 512-ren multiploa" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "paketean zeroz betetako blokeak alde batetara utzi" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "irakurri ahala berriz bloke egin (4.2BSD tutuentzat)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Pakete formatu hautapena:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMATUA" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "emandako formatuko pakete bat sortu" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMATUA hauetako bat da:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "V7 tar formatu zaharra" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU formatua tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x formatua" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) formatua" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) formatua" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "pax-en berdina" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "--format=v7-ren berdina" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "--format=posix-ren berdina" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "gakoa[[:]=balioavalue][,gakoa[[:]=balioa]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TESTUA" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Elkarjotzen duten konpresio aukerak" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "fitxategia bzip2 bidez iragazi" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "fitxategia gzip bidez iragazi" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "fitxategia konpresorearen bidez iragazi" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "fitxategia gzip bidez iragazi" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "fitxategia gzip bidez iragazi" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "fitxategia gzip bidez iragazi" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "PROG bidez iragazi (-d onartu behar du)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Fixtategi lokal hautapena:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "DIR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "DIR direktoriora aldatu" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "ateratzeko edo sortzeko izenak FITXATEGIA-tik eskuratu" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "PATROIA" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "fixtategiak utzi, PATROIA bezala emandakoak" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "FITXATEGIAN zerrendaturiko patroiak alde batetara utzi" -#: src/tar.c:640 +#: src/tar.c:641 #, 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:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:648 +#: src/tar.c:649 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:653 +#: src/tar.c:654 #, fuzzy msgid "exclude directories containing FILE" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "sahiestu automatikoki direktorioetan zehar jeistea" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "fitxategi sistema lokalean egon paketea sortzerakoan" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "direktorioetan barrena (lehenetsia)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "Ez kendu hasierako `/' fitxategi izenetatik" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 #, 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "PARTAIDE IZEN" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATA" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "data eta ordua parekatu data bakarrik aldatzen denean" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "KONTROL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "babeskopia egin ezabatu aurretik, KONTROL bertsioa hautatu" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "KATEA" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Fitxategi izen eraldaketak:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "ESPRESIOA" -#: src/tar.c:688 +#: src/tar.c:689 #, fuzzy msgid "use sed replace EXPRESSION to transform file names" msgstr "Sed-en ordezko EXPRESIOA erabili fitxategi izenak eraldatzeko" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "kasua alde batetara utzi" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "verbatim kate parekatzea" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "irteera informatiboa:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Aurrerapen mezuak bistarazi grabaketa ZENBAKI bakiotzagatik (lehenetsia 10 " "da)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "mezu bat inprimatu lotura guztiak ez badira iraultzen" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SEINALEA" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2010,273 +2028,269 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "eraldaketa datak UTC orduan bistarazi" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "irteera luzea FITXATEGIRA bidali" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "Bloke zenbakia bistarazu pakete bakoitzeko mezu bakoitzagatik" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "berrespena eskatu ekintza bakoitzean" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "tar lehenespenak bistarazi" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "fixtategi edo pakete izenak bistarazi eraldaketaren aurretik" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "ESTILOA" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "Gako karaktere gehigarriak KATE-tik" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "gakoak kendu karaktereentzat KATE-tik" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Bateragarritasun aukerak:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Beste aukerak:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "ezgaitu arriskutsu izan daitezken zenbait aukera" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Ezin duzu `-Acdtrux' aukera bat baino gehiago ezarri" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Elkarjotzen duten konpresio aukerak" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Seinale izen ezezaguna: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Data adibide fitxategia ez da aurkitu" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s %s data formatu ezezagunagatik aldatzen" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: fitxategi zerrenda irakurria dagoeneko" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style-entzat balio erabilgarriak:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Blokeo faktore baliogabea" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Zinta luzera baliogabea" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Atari data bat baino gehiago" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ez da onartzen plataforma honetan" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "--checkpoint balioa ez da zenbaki oso bat" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Talde baliogabea" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Modu baliogabea eman da aukeran" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Zenbaki baliogabea" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Jabe baliogabea" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Grabazio tamaina baliogabea" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Grabaszio tamaina %d-ren multiplo bat izan behar da." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Elementu kopuru baliogabea" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "--to-command aukera bat bakarrik onartzen da" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Gaizki eratutako dentsitate argumentua: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Dentsitate Ezezaguna: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FITXATEGIA]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "`%c' zaharkituriko aukerak argumentu bat behar du" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Pakete fitxategi anitzentzat `-M' aukera erabili behar da" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Ezin dira --listed-incremental eta --newer batera erabili" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Ezin dira bolumen-anitzeko paketeak egiaztatu" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Ezin dira konprimituriko fitxategiak egiaztatu" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Ezin dira bolumen anitzeko konprimituriko paketeak erabaili" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Ezin dira konprimituriko paketeak kateatu" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr " `-Aru' aukerak bateraezinak dira `-f -' rekin" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Behintzat `-Acdtrux' aukeretako bat ezarri behar duzu" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2635,6 +2649,9 @@ msgstr "--stat -ek fitxategi izenak behar ditu" msgid "too many arguments" msgstr "argumentu gehiegi" +#~ 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?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "--delay-directory-restore aukeraren eragina ezeztatu" diff --git a/po/fi.gmo b/po/fi.gmo index 65b2580..1bd4882 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 56a1e67..5f78190 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.16.1\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2006-12-09 18:58+0200\n" "Last-Translator: Lauri Nurmi \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "näytä tämä ohje" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "näytä lyhyt käyttöohje" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NIMI" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "näytä ohjelman versio" @@ -314,11 +314,11 @@ msgstr "Korvataan ”.” tyhjällä kovan linkin kohteella" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "”" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "”" @@ -373,7 +373,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -470,6 +470,29 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Ohjelmistovioista voi ilmoittaa (englanniksi) osoitteeseen\n" +"<%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -506,16 +529,6 @@ msgstr "" " --version Näytä versiotiedot.\n" " --help Näytä tämä ohje.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Ohjelmistovioista voi ilmoittaa (englanniksi) osoitteeseen\n" -"<%s>.\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -541,104 +554,104 @@ msgstr "Ennenaikainen tiedoston loppu" msgid "Garbage command" msgstr "Roskakomento" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Kirjoitettuja tavuja yhteensä" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Poistettuja tavuja yhteensä: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(putki)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Virheellinen arvo kentälle record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Arkiston nimeä ei ole annettu" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Vakiosyötteessä/tulosteessa olevaa arkistoa ei voi varmistaa" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arkisto on tiivistetty. Käytä valitsinta %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Pakattuja arkistoja ei voi päivittää" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Nauhan alussa, lopetetaan" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Liian monta virhettä, lopetetaan" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ei pysähtynyt tietueen rajalle" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sisältää virheellisen arkiston osan järjestysnumeron" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Arkisto-osan järjestysnumeron ylivuoto" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Valmistele osa #%d arkistolle %s ja paina return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Tiedoston loppu odotetun käyttäjän syötteen sijaan" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "VAROITUS: Arkisto on epätäydellinen" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -650,67 +663,67 @@ msgstr "" " q Keskeytä tar\n" " y tai rivinv. Jatka suoritusta\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Käynnistä alikuori\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Näytä tämä lista\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Ei uutta arkiston osaa, poistutaan.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Tiedostonimeä ei annettu. Yritä uudelleen.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "Komento %s epäonnistui" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s ei jatku tällä arkiston osalla" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s on väärän kokoinen (%s ≠ %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, 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:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkistoa ei ole nimetty täsmää nimiöön %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Arkiston osa %s ei täsmää nimiöön %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -718,7 +731,7 @@ msgstr "" "%s: tiedostonimi on liian pitkä tallennettavaksi moniosaisen GNU-arkiston " "otsakkeeseen; nimi typistetty" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek ei pysähtynyt tietueen rajalle" @@ -734,7 +747,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Odottamaton tiedoston loppu arkistossa" @@ -853,7 +866,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -882,7 +895,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:535 +#: src/create.c:1591 src/incremen.c:543 #, fuzzy msgid "directory not dumped" msgstr "%s: näyttää välimuistihakemistolta, ei lisätä" @@ -978,125 +991,125 @@ msgstr "%s: Uudelleennimeäminen nimelle %s ei onnistu" msgid "Error is not recoverable: exiting now" msgstr "Virhe ei ole korjattavissa, poistutaan nyt" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Hakemisto %s on nimetty uudelleen" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Hakemisto on nimetty uudelleen" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Hakemisto on uusi" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Virheellinen aikaleima" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Virheellinen muutosaika (sekunnit)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Virheellinen muutosaika (nanosekunnit)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Virheellinen laitenumero" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Virheellinen i-solmun numero" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Odottamaton tiedoston loppu arkistossa" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Kelvoton tiheysargumentti: ”%s”" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Kelvoton tiheysargumentti: ”%s”" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Väliaikaishakemiston luominen %s-mallia käyttäen ei onnistu" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ei poisteta hakemistoa: stat ei onnistu" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: hakemisto on eri laitteella, ei poisteta" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Poistetaan %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei voi poistaa" @@ -1319,86 +1332,86 @@ msgstr "" " muuten yksinkertaisia\n" " never, simple tee aina yksinkertaisia varmuuskopioita\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Päätoimintatila:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "listaa arkiston sisältö" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "pura tiedostoja arkistosta" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "luo uusi arkisto" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "etsi arkiston ja tiedostojärjestelmän väliset erot" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "lisää tiedostoja arkiston loppuun" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "lisää vain arkistokopiota uudemmat tiedostot" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "lisää tar-tiedostoja arkistoon" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "poista tiedostoja arkistosta (ei toimi magneettinauhoilla!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Toimintovalinnat:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "käsittele harvat tiedostot tehokkaasti" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "käsittele vanha GNU-muotoinen lisääntyvä varmuuskopio" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "TIED" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "käsittele uusi GNU-muotoinen lisääntyvä varmuuskopio" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "jatka lukukelvottomista tiedostoista huolimatta" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "MÄÄRÄ" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1411,299 +1424,299 @@ msgstr "" "annettu komentirivillä tai -T-valitsimella; oletusMÄÄRÄ on 1" # Muualla seek on siirtymistä... -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "arkisto on selattava" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "yritä varmistaa arkisto kirjoittamisen jälkeen" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "poista tiedostot arkistoon lisäämisen jälkeen" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "älä korvaa olemassaolevia tiedostoja purettaessa" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "ylikirjoita olemassaolevat tiedostot purettaessa" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "poista jokainen tiedosto ennen sen päälle purkamista" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "tyhjennä rakenne ennen hakemiston purkamista" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "säilytä olemassaolevien hakemistojen metatiedot" -#: src/tar.c:447 +#: src/tar.c:446 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "ylikirjoita olemassaolevat tiedostot purettaessa" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Valitse tulostusvirta:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "pura tiedostot vakiotulosteeseen" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMENTO" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "putkita puretut tiedostot toiselle ohjelmalle" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "jätä lapsiprosessien paluuarvot huomiotta" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "käsittele lapsiprosessien nollasta poikkeavat paluuarvot virheinä" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Tiedostojen ominaisuuksien käsittely:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "pakota NIMI lisättyjen tiedostojen omistajaksi" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "pakota NIMI lisättyjen tiedostojen ryhmäksi" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "PÄIVÄYS-TAI-TIED" -#: src/tar.c:474 +#: src/tar.c:473 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "tallenna vain PÄIVÄYS-TAI-TIEDostoa uudemmat tiedostot" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "MUUTOS" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "pakota (symbolinen) tila MUUTOS lisätyille" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "älä pura tiedoston muutosaikaa" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "yritä purkaa tiedostot samalla omistajuudella" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "pura tiedostot itsenäsi" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "käytä aina numeroita käyttäjän/ryhmän nimissä" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "lajittele purettavat tiedostonimet täsmäämään arkistoon" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "sama kuin -p ja -s yhdessä" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 #, fuzzy msgid "Device selection and switching:" msgstr "Laitteen valinta ja vaihtaminen:\n" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARKISTO" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "käytä arkistotiedostoa tai -laitetta ARKISTO" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "arkisto on paikallinen vaikka nimessä olisi kaksoispiste" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "käytä rmt-KOMENTOA rmt:n sijaan" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "käytä etäKOMENTOa rsh:n sijaan" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "anna asema ja tiheys" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "luo/listaa/pura moniosainen arkisto" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "vaihda nauhaa MÄÄRÄ × 1024 kirjoitetun tavun jälkeen" -#: src/tar.c:541 +#: src/tar.c:540 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:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "käytä/päivitä arkiston osan numero TIEDostossa" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Laitteen lohkot:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "LOHKOT" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "LOHKOT × 512 tavua tietuetta kohti" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "MÄÄRÄ tavua tietuetta kohti, 512:n monikerta" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "älä huomioi nollattuja lohkoja arkistossa (merkitsee tiedoston loppua)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "suorita lohkominen uudelleen luettaessa (4.2BSD-putkia varten)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Arkistomuodon valinta:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "MUOTO" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "luo annetun muotoinen arkisto" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "MUOTO on yksi seuraavista:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "vanha V7-tar-muoto" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU-muoto tar-versioilla ≤ 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x -muoto" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) -muoto" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) -muoto" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "sama kuin pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "sama kuin --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "sama kuin --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "avainsana[[:]=arvo][,avainsana[[:]=arvo]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "määrittele pax-avainsanoja" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEKSTI" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1711,192 +1724,197 @@ msgstr "" "luo arkisto nimiöllä TEKSTI. Listattaessa/purettaessa käytä TEKSTIä " "nimiönhakulausekkeena" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Ristiriitaiset pakkausvalitsimet" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "ohjaa arkisto bzip2-ohjelman läpi" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "ohjaa arkisto gzip-ohjelman läpi" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "ohjaa arkisto compress-ohjelman läpi" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "ohjaa arkisto gzip-ohjelman läpi" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "ohjaa arkisto gzip-ohjelman läpi" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "ohjaa arkisto gzip-ohjelman läpi" + +#: src/tar.c:614 msgid "PROG" msgstr "OHJ" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "ohjaa OHJelman läpi (on hyväksyttävä -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Paikallisten tiedostojen valinta:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "HAK" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "siirry hakemistoon HAK" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "hae purettavat/luotavat nimet TIEDOSTOsta" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T lukee nollaan päättyviä nimiä, poistaa käytöstä -C:n" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "HAHMO" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "jätä pois HAHMOn mukaiset tiedostot" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "jätä pois TIEDOSTOssa listatut hahmot" -#: src/tar.c:640 +#: src/tar.c:641 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "jätä pois välimuistihakemistot" -#: src/tar.c:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:648 +#: src/tar.c:649 #, 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:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "estä automaattinen eteneminen alihakemistoihin" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "pysy nykyisessä tiedostojärjestelmässä arkistoa luotaessa" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "etene alihakemistoihin (oletus)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "älä poista ”/”-merkkiä tiedostonimien alusta" -#: src/tar.c:665 +#: src/tar.c:666 #, fuzzy msgid "follow symlinks; archive and dump the files they point to" msgstr "seuraa symlinkkejä; " -#: src/tar.c:667 +#: src/tar.c:668 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "seuraa symlinkkejä; " -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "TIED-NIMI" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "aloita arkiston tiedostosta TIED-NIMI" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "tallenna vain PÄIVÄYS-TAI-TIEDostoa uudemmat tiedostot" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "PÄIVÄYS" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "vertaa vain tiedoston muutosaikaa" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "HALLINTA" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "varmuuskopiointi ennen poistoa, valitse versionHALLINTA" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "MERKKIJONO" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1904,95 +1922,95 @@ msgstr "" "varmuuskopiointi ennen poistoa, älä käytä tavanomaista jälkiliitettä (joka " "on ”~”, ellei muuttujaa SIMPLE_BACKUP_SUFFIX ole asetettu)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "poista MÄÄRÄn verran osia tiedostonimien alusta" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 #, fuzzy msgid "ignore case" msgstr "poisjättäminen ei huomioi kirjainkokoa" -#: src/tar.c:699 +#: src/tar.c:700 #, fuzzy msgid "patterns match file name start" msgstr "poisjättöhahmoja verrataan nimen alkuun" -#: src/tar.c:701 +#: src/tar.c:702 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "poisjättöhahmoja verrataan jokaisen ”/”:n jälkeen" -#: src/tar.c:703 +#: src/tar.c:704 #, fuzzy msgid "case sensitive matching (default)" msgstr "poisjättäminen huomioi kirjainkoon (oletus)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "poisjättöhahmon jokerimerkit eivät täsmää ”/”-merkkiin" -#: src/tar.c:711 +#: src/tar.c:712 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "poisjättöhahmon jokerimerkit vastaavat merkkiä ”/”" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Tietoja antava tuloste:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "listaa käsiteltävät tiedostot" -#: src/tar.c:721 +#: src/tar.c:722 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "näytä edistymisviesti 10 sekunnin välein" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "näytä viesti, ellei kaikkia linkkejä lisätty" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2000,58 +2018,58 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "näytä tiedostojen muutosajat UTC-aikoina" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "ohjaa monisanainen tuloste TIEDostoon" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "näytä lohkonumero arkistossa viestien yhteydessä" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "kysy varmistusta jokaiselle toiminnolle" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "näytä tarin oletukset" -#: src/tar.c:745 +#: src/tar.c:746 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:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Yhteensopivuusvalitsimet:" -#: src/tar.c:763 +#: src/tar.c:764 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" @@ -2059,57 +2077,57 @@ msgid "" msgstr "" "luotaessa sama kuin --old-archive purettaessa sama kuin --no-same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Muut valitsimet:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "poista käytöstä joitakin potentiaalisesti vahingollisia valitsimia" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Vain yhtä valitsimista ”-Acdtrux” voi käyttää kerrallaan" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Ristiriitaiset pakkausvalitsimet" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Tuntematon signaalin nimi: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Päiväystiedostoa ei löytynyt" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Korvataan tuntematon päiväysmuoto %2$s arvolla %1$s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, 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:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: tiedosto on arkistossa, ei lisätä" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: tiedostonimi sisältää nul-merkin" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Kelvolliset argumentit --quoting-style -valitsimille ovat:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2117,162 +2135,158 @@ msgstr "" "\n" "*Tämä* tar käyttää oletuksena:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Virheellinen lohkomiskerroin" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Virheellinen nauhan pituus" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Annettu useampi kuin yksi kynnyspäiväys" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ei ole tuettu tällä alustalla" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Virheellinen ryhmä" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Valitsimelle annettiin virheellinen tila" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Virheellinen määrä" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Virheellinen omistaja" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Virheellinen tietueen koko" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Tietueen koon on oltava %d:n monikerta." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Virheellinen osien määrä" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Kelvoton tiheysargumentti: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Tuntematon tiheys: ”%c”" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[TIEDOSTO]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Vanha valitsin ”%c” vaatii argumentin." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "valitsin --occurence on merkityksetön ilman tiedostoluetteloa" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "valitsinta --occurence ei voi käyttää pyydetyssä toimintatilassa" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Usean arkistotiedoston käyttäminen vaatii valitsimen ”-M”" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Valitsimia --listed-incremental ja --newer ei voi käyttää yhdessä" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Moniosaisia arkistoja ei voi tarkastaa" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Pakattuja arkistoja ei voi varmistaa" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Pakattuja moniosaisia arkistoja ei voi käyttää" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Pakattuja arkistoja ei voi liittää toisiinsa" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "Valitsinta --pax-option voi käyttää vain POSIX-arkistoille" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Kieltäydytään pelkurimaisesti luomasta tyhjää arkistoa" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Valitsimet ”-Aru” eivät ole yhteensopivia valitsinten ”-f -” kanssa" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Vähintään yhtä valitsimista ”-Acdtrux” on käytettävä" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2637,6 +2651,9 @@ msgstr "--Sovitetut tiedostonimet--\n" msgid "too many arguments" msgstr "liian monta argumenttia" +#~ 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?" + #~ msgid "block size" #~ msgstr "lohkokoko" diff --git a/po/fr.gmo b/po/fr.gmo index 0d6a80c..03bee48 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 0bb935c..a35fdf3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tar-1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2008-04-14 22:07+0200\n" "Last-Translator: Christophe Combelles \n" "Language-Team: French \n" @@ -82,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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "Rapportez toute anomalie à %s.\n" @@ -91,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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "Afficher cette aide-mémoire" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "Afficher un court mode d'emploi" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NOM" @@ -112,11 +112,11 @@ msgstr "définit le nom du programme" msgid "SECS" msgstr "SECS" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "Bloquer pendant SECS secondes (3600 par défaut)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "Afficher la version du programme" @@ -317,11 +317,11 @@ msgstr "Remplacement des cibles vides par « . » pour les liens physiques" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "« " -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr " »" @@ -373,10 +373,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -497,6 +498,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s et d'autres personnes.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Rapportez toute anomalie à <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Chaîne trop longue en entrée" @@ -534,15 +557,6 @@ msgstr "" " --version afficher le nom et la version du programme\n" " --help afficher cette aide-mémoire\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Rapportez toute anomalie à <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Erreur de positionnement relatif" @@ -567,107 +581,107 @@ msgstr "Fin de fichier prématurée" msgid "Garbage command" msgstr "Commande rejetée" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Nombre total d'octets écrits" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Nombre total d'octets lus" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Nombre total d'octets effacés : %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(tube)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Valeur incorrecte pour « record_size »" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Aucun nom d'archive donné" -#: src/buffer.c:522 +#: src/buffer.c:524 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:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "L'archive est compressée. Utilisez l'option %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Une archive compressée ne peut pas être mise à jour" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Début de la cartouche atteinte ; arrêt du programme." -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Trop d'erreurs, arrêt du programme." -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ne s'est pas arrêté à une limite d'enregistrement" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s : contient un numéro de volume non valable" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Débordement du numéro de volume" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 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:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "AVERTISSEMENT : l'archive est incomplète" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -678,67 +692,67 @@ msgstr "" " q Arrêter tar\n" " y ou newline Continuer le traitement\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Générer un sous-shell\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Afficher cette liste\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Pas de nouveau volume ; fin du traitement.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Nom de fichier non spécifié. Essaye encore :).\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, 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:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "Échec de la commande %s" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "La suite de %s n'est pas sur ce volume." -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s a une taille incorrecte (%s != %s + %s)." -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ce volume est hors séquence." -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Archive non étiquetée pour correspondre à %s." -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Le volume %s ne correspond pas à %s." -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -746,7 +760,7 @@ msgstr "" "%s : nom de fichier tronqué, car trop long pour être stocké dans un en-tête " "GNU multi-volumes" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek ne s'est pas arrêté à une limite d'enregistrement" @@ -762,7 +776,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fin prématurée rencontrée dans l'archive." @@ -887,7 +901,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "contenu non archivé" @@ -916,7 +930,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "répertoire non archivé" @@ -1010,123 +1024,123 @@ msgstr "Impossible de renommer %s en %s" msgid "Error is not recoverable: exiting now" msgstr "Erreur non récupérable : arrêt du traitement" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s : le répertoire a été renommé depuis %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s : le répertoire a été renommé." -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s : le répertoire est nouveau." -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Horodatage non valable" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Temps de modification non valable (secondes)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Temps de modification non valable (nanosecondes)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Numéro de périphérique non valable" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Numéro d'inode non valable" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Champ trop long rencontré pendant la lecture du fichier d'instantané" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Erreur de lecture du fichier d'instantané" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Fin prématurée du fichier d'instantané" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Valeur de champ inattendue dans le fichier d'instantané" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Terminaison de champ manquante" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Mauvais format de fichier incrémental" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Version non prise en charge pour le format incrémental : %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir incorrect : « %c » était attendu mais %#3o a été trouvé" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir incorrect : « X » en double" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir incorrect : nom vide dans « R »" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir incorrect : « T » non précédé de « R »" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir incorrect : nom vide dans « T »" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir incorrect : « X » n'a jamais été utilisé" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s : répertoire non purgé : impossible d'évaluer par stat()" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s : suppression de %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s : suppression impossible" @@ -1359,91 +1373,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:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Mode d'opération principal :" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "Afficher le contenu de l'archive" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "Extraire les fichiers de l'archive" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "Créer une nouvelle archive" -#: src/tar.c:381 +#: src/tar.c:380 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:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "Ajouter des fichiers à la fin de l'archive" -#: src/tar.c:386 +#: src/tar.c:385 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:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "Ajouter des fichiers tar à une archive" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "Effacer de l'archive (pas sur les bandes magnétiques !)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "Tester l'étiquette du volume d'archive et terminer" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Modificateurs d'opération :" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" "Économiser efficacement l'espace dans les fichiers dispersés (fichiers à " "trous)" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJEUR[.MINEUR]" -#: src/tar.c:403 +#: src/tar.c:402 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:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "Prendre en charge les sauvegardes incrémentales à l'ancien format GNU" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FICHIER" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "Prendre en charge les sauvegardes incrémentales au nouveau format GNU" -#: src/tar.c:409 +#: src/tar.c:408 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:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NOMBRE" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1456,127 +1470,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "L'archive peut être parcourue" -#: src/tar.c:419 +#: src/tar.c:418 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:422 +#: src/tar.c:421 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:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Contrôle de l'écrasement :" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "Tenter de vérifier l'archive après écriture" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "Supprimer les fichiers après les avoir ajoutés à l'archive" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "Ne pas écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "Écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "Effacer chaque fichier préexistant avant l'extraction" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "Vider les hiérarchies avant d'extraire les répertoires" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "Préserver les métadonnées des répertoires préexistants" -#: src/tar.c:447 +#: src/tar.c:446 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:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Choix du flux de sortie :" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "Extraire les fichiers vers la sortie standard" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMMANDE" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "Renvoyer par tube les fichiers extraits vers un autre programme" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "Ignorer les codes de retour des processus enfants" -#: src/tar.c:462 +#: src/tar.c:461 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:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Traitement des attributs de fichiers :" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "Utiliser NOM comme propriétaire des fichiers ajoutés" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "Utiliser NOM comme groupe des fichiers ajoutés" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATE-OU-FICHIER" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "CHANGEMENTS" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" "Utiliser les CHANGEMENTS de mode (symboliques) pour les fichiers ajoutés" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "MÉTHODE" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1586,29 +1600,29 @@ msgstr "" "lecture (MÉTHODE = « replace » par défaut) ou en ne définissant pas les dates " "initialement (MÉTHODE = « system »)" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "Ne pas extraire la date de modification du fichier" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "Essayer d'extraire les fichiers avec le même propriétaire" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "Vous approprier les fichiers extraits" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "Toujours utiliser les valeurs numériques des utilisateurs/groupes" -#: src/tar.c:491 +#: src/tar.c:490 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:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1616,15 +1630,15 @@ msgstr "" "Appliquer l'umask de l'utilisateur lors de l'extraction des permissions (par " "défaut pour les utilisateurs normaux)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "Trier les noms à extraire dans le même ordre que l'archive" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "Équivalent à « -p -s » à la fois" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1632,139 +1646,139 @@ msgstr "" "Reporter à la fin de l'extraction le changement des dates de modification et " "des permissions des répertoires extraits" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "Annule l'effet de l'option « --delay-directory-restore »" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Sélection et option de périphérique :" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "Utiliser le fichier ou le périphérique ARCHIVE" -#: src/tar.c:515 +#: src/tar.c:514 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "Utiliser la COMMANDE rmt fournie au lieu de rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "Utiliser la COMMANDE distante à la place de rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "Spécifier le lecteur et la densité" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "Créer/lister/extraire une archive multi-volumes" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Changer de cartouche après avoir écrit NOMBRE x 1024 octets" -#: src/tar.c:541 +#: src/tar.c:540 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:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "Utiliser/mettre à jour le numéro de volume dans le FICHIER" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Blocs du périphérique :" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOCS" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCS x 512 octets par enregistrement" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NOMBRE d'octets par enregistrement (multiple de 512)" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Ignorer les blocs de zéros dans l'archive (càd EOF)" -#: src/tar.c:558 +#: src/tar.c:557 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:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Sélection du format d'archive :" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "Créer l'archive au format désiré." -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMAT peut prendre une des valeurs suivantes :" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "Vieux format tar V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "Format GNU issu de tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "Format GNU tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Format POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "Identique à pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "Identique à « --format=v7 »" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "Identique à « --format=posix »" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "mot_clé[[:]=valeur][,mot_clé[[:]=valeur]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "Mots-clés de contrôle pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEXTE" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1773,106 +1787,111 @@ msgstr "" "l'extraction, utiliser le TEXTE comme motif de correspondance (glob) au nom " "de volume." -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Options de compression :" -#: src/tar.c:596 +#: src/tar.c:595 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:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" +msgid "do not 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 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "Filtrer l'archive à travers « bzip2 »" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "Filtrer l'archive à travers « gzip »" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "Filtrer l'archive à travers « compress »" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "Filtrer l'archive à travers « lzma »" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "Filtrer l'archive à travers « gzip »" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "Filtrer l'archive à travers « gzip »" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "Filtrer à travers le PROG (doit accepter l'option « -d »)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Sélection des fichiers locaux :" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "RÉP" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "Utiliser RÉP comme répertoire de travail" -#: src/tar.c:626 +#: src/tar.c:627 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:628 +#: src/tar.c:629 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:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 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:634 +#: src/tar.c:635 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:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "MOTIF" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "Exclure les fichiers correspondant au MOTIF" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "Exclure les motifs listés dans le FICHIER" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1880,95 +1899,95 @@ msgstr "" "Exclure le contenu des répertoires contenant CACHEDIR.TAG, sauf le fichier " "de tag lui-même" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "Tout exclure dans les répertoires contenant CACHEDIR.TAG" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Exclure les répertoires contenant CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "Tout exclure dans les répertoires contenant le FICHIER" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "Exclure les répertoires contenant le FICHIER" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "Exclure les répertoires de contrôle de version (CVS, .svn, etc.)" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "Empêcher la descente automatique dans les sous-répertoires" -#: src/tar.c:659 +#: src/tar.c:660 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:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "Parcourir les sous-répertoires de manière récursive (par défaut)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "Ne pas enlever le « / » au début des noms de fichiers" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "NOM-DE-MEMBRE" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "Débuter au NOM-DE-MEMBRE dans l'archive" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "Stocker seulement les fichiers plus récents que DATE-OU-FICHIER" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATE" -#: src/tar.c:674 +#: src/tar.c:675 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:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "CONTRÔLE" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" "Faire une copie de sauvegarde avant suppression, choisir le CONTRÔLE de " "version" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "CHAÎNE" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1977,100 +1996,100 @@ msgstr "" "habituel (« ~ » sauf s'il est définit par la variable d'environnement " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Transformation des noms de fichiers :" -#: src/tar.c:685 +#: src/tar.c:686 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:688 +#: src/tar.c:689 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:694 +#: src/tar.c:695 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:697 +#: src/tar.c:698 msgid "ignore case" msgstr "Ignorer la casse (majuscules/minuscules)" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "Les motifs doivent correspondre au début des noms de fichiers" -#: src/tar.c:701 +#: src/tar.c:702 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:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "Correspondance sensible à la casse (comportement par défaut)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" "Utiliser des caractères de correspondance (par défaut pour l'exclusion)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "Correspondance exacte de chaîne" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "« / » ne correspond à aucun caractère de correspondance" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" "« / » peut correspondre à un caractère de correspondance (par défaut pour " "l'exclusion)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Options d'affichage :" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "Afficher de manière détaillée les fichiers traités" -#: src/tar.c:721 +#: src/tar.c:722 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "exécuter l'ACTION à chaque point de contrôle" -#: src/tar.c:727 +#: src/tar.c:728 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:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2082,27 +2101,27 @@ msgstr "" "sont : SIGHUP, SIGQUIT, SIGINT, SIGUSR1 et SIGUSR2. Les noms sans préfixe « " "SIG » sont aussi acceptés" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "Afficher les dates de modification de fichier en UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "Envoyer la sortie détaillée vers le FICHIER" -#: src/tar.c:738 +#: src/tar.c:739 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:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "Demander confirmation pour chaque action" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "Afficher les paramètres par défaut de tar" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2110,33 +2129,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:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "Afficher les noms des fichiers ou des archives après transformation" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "Protéger aussi les caractères faisant partie de la CHAÎNE" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "Enlever la protection des caractères faisant partie de la CHAÎNE" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Options de compatibilité :" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2144,56 +2163,56 @@ msgstr "" "Lors de la création, identique à « --old-archive ». Lors de l'extraction, " "identique à « --no-same-owner »" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Autres options :" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "Désactiver certaines options potentiellement néfastes" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Options de compression non compatibles entre elles" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Type de signal inconnu : %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Fichier d'échantillon de date non trouvé" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Remplacement par %s du format de date inconnu %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Option %s : date « %s » traitée comme %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s : la liste de fichiers est déjà lue" -#: src/tar.c:1184 +#: src/tar.c:1185 #, 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:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Les arguments valables pour les options « --quoting-style » sont :" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2201,118 +2220,112 @@ msgstr "" "\n" "Les valeurs par défaut de *ce* tar sont :\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Facteur de bloc non valable" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Longueur de cartouche non valable" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Plus d'une date seuil" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Version de la dispersion non valable" -#: src/tar.c:1585 +#: src/tar.c:1584 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:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "la valeur de « --checkpoint » n'est pas un entier" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s : groupe non valable" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Mode non valable donné en option" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Nombre non valable" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Propriétaire non valable" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Taille d'enregistrement non valable" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Nombre d'éléments incorrect" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Une seule option « --to-command » est permise" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Argument de densité incorrect : %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Densité inconnue : « %c »" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FICHIER]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "L'ancienne option « %c » a besoin d'un argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence n'a pas de sens sans une liste de fichiers" -#: src/tar.c:2241 +#: src/tar.c:2240 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:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Les fichiers d'archives multiples ont besoin de l'option « -M »" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Impossible de combiner « --listed-incremental » avec « --newer »" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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)" @@ -2321,47 +2334,47 @@ msgstr[0] "" msgstr[1] "" "%s: l'étiquette du volume est trop longue (la limite est %lu octets)" -#: src/tar.c:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Impossible de vérifier des archives multi-volumes" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Impossible de vérifier des archives compressées" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Impossible d'utiliser des archives multi-volumes compressées" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Impossible de concaténer des archives compressées" -#: src/tar.c:2332 +#: src/tar.c:2331 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:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 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:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Les options « -Aru » sont incompatibles avec « -f - »" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Vous devez choisir une des options « -Acdtrux » " -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2732,6 +2745,11 @@ msgstr "--stat nécessite un nom de fichier" msgid "too many arguments" msgstr "trop d'arguments" +#~ 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 » ?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "Annule l'effet de l'option « --delay-directory-restore »" diff --git a/po/ga.gmo b/po/ga.gmo index 0b48f03..d98665c 100644 Binary files a/po/ga.gmo and b/po/ga.gmo differ diff --git a/po/ga.po b/po/ga.po index 489bbcd..72edc09 100644 --- a/po/ga.po +++ b/po/ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2008-04-14 21:53-0600\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "taispeáin an chabhair seo" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "taispeáin beagán eolais faoin úsáid" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: 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:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "moill de SOIC soicind (réamhshocrú: 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "taispeáin leagan an chláir" @@ -324,11 +324,11 @@ msgstr "Ag cur `.' in ionad sprioc fholamh den nasc crua" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -382,10 +382,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -505,6 +506,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s, agus daoine eile nach iad.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Seol tuairiscí fabhtanna chuig <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Teaghrán ionchurtha rófhada" @@ -541,15 +564,6 @@ msgstr "" " --version Taispeáin eolas faoin leagan.\n" " --help Taispeáin an chabhair seo.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Seol tuairiscí fabhtanna chuig <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Earráid i bhfritháireamh 'seek'" @@ -574,58 +588,58 @@ msgstr "Comhadchríoch gan choinne" msgid "Garbage command" msgstr "Ordú dramhaíola" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Bearta scríofa go hiomlán" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Bearta léite go hiomlán" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Bearta scriosta go hiomlán: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(píopa)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Luach neamhbhailí do record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Ní thugtar ainm na cartlainne" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Ní féidir cartlann stdin/stdout a fhíorú" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Is cartlann chomhbhrúite í seo. Úsáid an rogha %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a nuashonrú" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Tosach na téipe, ag scor anois" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "An iomarca earráidí, ag scor" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -635,7 +649,7 @@ msgstr[2] "Méid taifid = %lu bhloc" msgstr[3] "Méid taifid = %lu mbloc" msgstr[4] "Méid taifid = %lu bloc" -#: src/buffer.c:716 +#: src/buffer.c:718 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -645,38 +659,38 @@ msgstr[2] "Bloc neamhailínithe (%lu bheart) sa chartlann" msgstr[3] "Bloc neamhailínithe (%lu mbeart) sa chartlann" msgstr[4] "Bloc neamhailínithe (%lu beart) sa chartlann" -#: src/buffer.c:793 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "Níor stopadh rmtlseek ag teorainn taifid" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: tá uimhir imleabhair neamhbhailí ann" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Uimhir imleabhair thar maoil" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Fuarthas comhadchríoch in áit freagra ón úsáideoir" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "RABHADH: Tá an chartlann neamhiomlán" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -688,67 +702,67 @@ msgstr "" " q Tobscoir tar\n" " y nó líne nua Lean ar aghaidh\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Sceith fobhlaosc\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Priontáil an liosta seo\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Níl aon imleabhar nua; ag scor.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Ainm an chomhaid gan sonrú. Bain triail eile as.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ionchur neamhbhailí. Iontráil ? chun cabhair a fháil.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "Theip ar ordú %s" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "Ní leanann %s ar an imleabhar seo" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, 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:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tá an t-imleabhar seo as ord" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Lipéad ar chartlann nach comhoiriúnaithe le %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Níl an t-imleabhar %s comhoiriúnaithe le %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -756,7 +770,7 @@ msgstr "" "%s: ní féidir an comhadainm seo a stóráil i gceanntásc il-imleabhar GNU; " "teasctha" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "Níor stopadh rmtlseek ag teorainn taifid" @@ -775,7 +789,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Comhadchríoch gan choinne i gcartlann" @@ -899,7 +913,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "ábhar gan dumpáil" @@ -928,7 +942,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "níor dumpáladh an chomhadlann" @@ -1024,124 +1038,124 @@ msgstr "Ní féidir %s a athainmniú go %s" msgid "Error is not recoverable: exiting now" msgstr "Ní féidir biseach a dhéanamh i ndiaidh earráid: ag scor" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Athainmníodh an chomhadlann ó %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Athainmníodh an chomhadlann" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Comhadlann nua" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Stampa ama neamhbhailí" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Am neamhbhailí mionathraithe (soicindí)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Am neamhbhailí mionathraithe (nanashoicindí)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Uimhir neamhbhailí gléis" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Uimhir inode as raon" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Réimse rófhada agus an comhad roghbhlúire á léamh" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Earráid agus an comhad roghbhlúire á léamh" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Comhadchríoch gan choinne sa chomhad roghbhlúire" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Luach réimse gan choinne sa chomhad roghbhlúire" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Críochnaitheoir taifid ar iarraidh" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Drochfhormáid incriminteach" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Ní thacaítear leis an leagan seo den fhormáid incriminteach: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, 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:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir míchumtha: 'X' faoi dhó" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir míchumtha: ainm folamh i 'R'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir míchumtha: 'T' gan 'R' roimhe" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir míchumtha: ainm folamh i 'T'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir míchumtha: níor úsáideadh 'X' riamh" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ní féidir an chomhadlann a stat: gan ghlanadh" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s á scriosadh\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ní féidir scriosadh a dhéanamh" @@ -1365,87 +1379,87 @@ msgstr "" "bhfuil\n" " never, simple déan cúltacaí simplí i gcónaí\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Príomh-mhód oibre:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "taispeáin an t-ábhar i gcartlann" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "bain comhaid as cartlann" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "cruthaigh cartlann nua" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "taispeáin difríochtaí idir cartlann agus córas comhaid" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "iarcheangail le deireadh cartlainne" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "ná hiarcheangail ach comhaid mhionathraithe leis an gcartlann" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "iarcheangail comhaid tar le cartlann" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "scrios as an gcartlann (nach ar théipeanna maighnéadacha!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "tástáil lipéad imleabhair na cartlainne agus scoir" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Mionathraitheoirí oibríochta:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "caith le gannchomhaid go héifeachtach" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "PRÍOMH[.MION]" -#: src/tar.c:403 +#: src/tar.c:402 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:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "déan cúltaca incriminteach de shean-nós GNU" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "COMHAD" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "déan cúltaca incriminteach nua-aoise GNU" -#: src/tar.c:409 +#: src/tar.c:408 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:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "UIMHIR" -#: src/tar.c:411 +#: src/tar.c:410 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1457,122 +1471,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "tá an chartlann inchuardaithe" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" "ná seiceáil uimhreacha gléasanna agus cartlanna incriminteacha á gcruthú" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" "seiceáil uimhreacha gléasanna agus cartlanna incriminteacha á gcruthú " "(réamhshocrú)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Rialú forscríofa:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "fíoraigh an chartlann i ndiaidh ag scríobh" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "scrios comhaid i ndiaidh iad a chur leis an gcartlann" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "ná forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "scrios gach comhaid sula scríobhtar air" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "folmhaigh géagchóras sula mbaintear comhadlann amach" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "ná forscríobh meiteashonraí comhadlainne" -#: src/tar.c:447 +#: src/tar.c:446 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:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Roghnaigh sruth aschurtha:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "bain comhaid amach agus scríobh ar an ngnáth-aschur" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "ORDÚ" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "píopaigh comhaid bhainte go ríomhchlár eile" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "ná bac le cóid scortha na macphróiseas" -#: src/tar.c:462 +#: src/tar.c:461 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:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Tréithe comhaid á láimhseáil:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "éiligh AINM mar úinéir de chomhaid bhreise" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "éiligh AINM mar ghrúpa de chomhaid bhreise" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DÁTA-NÓ-COMHAD" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "ATHRUITHE" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "déan ATHRUITHE ar mhód de chomhaid bhreise" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "MODH" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1582,27 +1596,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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "ná bain am mionathraithe an chomhaid" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "bain triail as úinéireacht a choinneáil" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "bain comhaid amach mar thusa féin" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "bain úsáid as uimhreacha d'ainmneacha úsáideora/grúpa" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "bain eolas faoi cheadanna (réamhshocrú don fhorúsáideoir)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1610,15 +1624,15 @@ msgstr "" "cuir umask an úsáideora i bhfeidhm agus ceadanna á mbaint ón chartlann " "(réamhshocrú do ghnáthúsáideoirí)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "sórtáil ainmneacha le cur in oiriúint" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "ar comhbhrí le -p agus -s araon" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1626,139 +1640,139 @@ msgstr "" "ná socraigh amanna mionathraithe ná ceadanna de na comhadlanna go dtí go " "bhfuil an bhaint curtha i gcrích" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "cealaigh an éifeacht de rogha --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Roghnú gléis agus malartú:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "CARTLANN" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "bain úsáid as cartlann chomhaid nó gléas CARTLANN" -#: src/tar.c:515 +#: src/tar.c:514 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "bain úsáid as ORDÚ in ionad rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "bain úsáid as ORDÚ cian in ionad rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "sonraigh tiomántán agus a dhlús" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "cruthaigh/liostaigh/bain amach cartlann le hiliomad imleabhair" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "athraigh téip i ndiaidh UIMHIR × 1024 beart" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "rith script i ndiaidh gach téip (-M intuigthe)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "úsáid/nuashonraigh an uimhir imleabhair i gCOMHAD" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Blocáil ghléis:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOIC" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOIC × 512 beart sa taifead" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "UIMHIR beart sa taifead, iolraí de 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "déan neamhshuim ar bhloic nialasacha sa chartlann (is ionann le EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "athbhlocáil le linn léimh (le píopaí 4.2BSD)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Roghnú formáide:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMÁID" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "cruthaigh cartlann san fhormáid seo" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "Is FORMÁID ceann de na rudaí seo:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "seanfhormáid V7 tar" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "formáid de réir GNU tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "formáid de réir GNU tar 1.13" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formáid POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formáid POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "ar comhbhrí le pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "is ionann le --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "is ionann le --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "lorgfhocal[[:]=luach][,lorgfhocal[[:]=luach]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "rialaigh lorgfhocail pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TÉACS" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1766,100 +1780,105 @@ 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:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Roghanna comhbhrúite:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "úsáid iarmhír na cartlainne chun an modh comhbhrúite a dhéanamh amach" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" +msgid "do not 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 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "scag an chartlann le bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "scag an chartlann le gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "scag an chartlann le compress" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "scag an chartlann le lzma" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "scag an chartlann le gzip" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "scag an chartlann le gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "CLÁR" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "scag le CLÁR (ní foláir -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Roghnú comhaid logánta:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "COMHADLANN" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "athraigh go dtí COMHADLANN" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "tóg ainmneacha le baint/cruthú as comhad COMHAD" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "léigh ainmneacha, foirceanta le NULanna; múch -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" "bain comharthaí athfhriotail ó chomhadainmneacha a léadh le -T (réamhshocrú)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "ná bain comharthaí athfhriotail ó chomhadainmneacha a léadh le -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "PATRÚN" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "fág comhaid as an áireamh, tugtha mar PHATRÚN" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "fág as an áireamh aon phatrún atá i gCOMHAD" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1867,90 +1886,90 @@ msgstr "" "gabh thar ábhar na gcomhadlann ina bhfuil CACHEDIR.TAG, seachas an comhad " "clibe féin" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "gabh thar gach rud faoi chomhadlanna ina bhfuil CACHEDIR.TAG" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "gabh thar chomhadlanna ina bhfuil CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "gabh thar gach rud faoi chomhadlanna ina bhfuil COMHAD" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "gabh thar chomhadlanna a bhfuil COMHAD iontu" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "gabh thar chomhadlanna a bhaineann le córas rialaithe foinsí" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "ná téigh isteach i bhfochomhadlanna go huathoibríoch" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "ná fág an córas comhaid seo agus cartlann á cruthú" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "téigh isteach i gcomhadlanna (réamhshocrú)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "ná struipeáil `/' tosaigh ó ainmneacha comhaid" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "lean naisc chrua; cartlannaigh agus dumpáil na comhaid a nascann na naisc leo" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "AINM-BAILL" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "tosaigh ag ball AINM-BAILL sa chartlann" -#: src/tar.c:671 +#: src/tar.c:672 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:673 +#: src/tar.c:674 msgid "DATE" msgstr "DÁTA" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "déan comparáid le dáta/am modhnaithe" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "MODH" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "déan cúltaca sula scriostar, roghnaigh modh oibre maidir le leaganacha" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "TEAGHRÁN" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1958,92 +1977,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:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Trasfhoirmiú ainmneacha comhaid:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "struipeáil UIMHIR comhpháirt tosaigh ó ainmneacha comhaid" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "SLONN" -#: src/tar.c:688 +#: src/tar.c:689 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:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Roghanna maidir le comhoiriúnú ainmneacha comhaid (cuirfear iad seo i " "bhfeidhm do phatrúin eisiata agus do phatrúin iniata araon):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "ná bí cásíogair" # subject is "exclude patterns" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "comhoiriúnaíonn patrúin do thosach ainm an chomhaid" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "comhoiriúnaíonn patrúin tar éis gach `/' (réamhshocrú i gcás eisiata)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "dealaigh idir litreacha beaga/móra (réamhshocrú)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "úsáid saoróga (réamhshocrú do phatrúin eisiata)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "comhoiriúnú teaghráin carachtar ar charachtar" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "ní ghlacann saoróga le `/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "comhoiriúnaíonn saoróga do `/' (réamhshocrú le patrúin eisiata)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Aschur faisnéiseach:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "taispeáin gach comhad atá próiseáilte, go foclach" -#: src/tar.c:721 +#: src/tar.c:722 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "GNÍOMH" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "déan GNÍOMH ag gach seicphointe" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "taispeáin eolas mura bhfuil gach nasc dumpáilte" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "COMHARTHA" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2055,27 +2074,27 @@ 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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "taispeáin dátaí mionathraithe de réir UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "scríobh aschur foclach i gCOMHAD" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "taispeáin bloc sa chartlann le gach teachtaireacht" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "iarr deimhniú ar gach gníomh" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "taispeáin réamhshocruithe tar" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2083,33 +2102,33 @@ msgstr "" "agus á liostú nó á bhaint amach, taispeáin gach comhadlann nach bhfuil " "comhoiriúnaithe don chuardach" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "taispeáin ainmneacha comhaid/cartlainne i ndiaidh trasfhoirmithe" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STÍL" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "cuir carachtair athfhriotail timpeall na carachtair ó TEAGHRÁN" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "ná húsáid comharthaí athfhriotail timpeall carachtair ó TEAGHRÁN" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Roghanna Comhoiriúnachta:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2117,56 +2136,56 @@ msgstr "" "is ionann le --old-archive le linn cruthaithe; is ionann le --no-same-owner " "le linn baint" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Roghanna eile:" -#: src/tar.c:771 +#: src/tar.c:772 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:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Ná tabhair ach ceann de na roghanna `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Roghanna contrártha comhbhrúite" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Comhartha anaithnid: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Comhad samplach dáta gan aimsiú" -#: src/tar.c:1017 +#: src/tar.c:1018 #, 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:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Rogha %s: Ag caitheamh le dáta `%s' mar %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: léadh an liosta comhad cheana" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: tá carachtar nialasach sa chomhadainm a léadh" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Argóintí bailí do roghanna --quoting-style:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2174,115 +2193,111 @@ msgstr "" "\n" "Luachanna réamhshocraithe don tar *seo*:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Fachtóir bacainneach neamhbhailí" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Fad téipe neamhbhailí" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Níos mó ná spriocdháta amháin" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Leagan neamhbhailí ar fhormáid na ngannchomhad" -#: src/tar.c:1585 +#: src/tar.c:1584 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:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "ní mór do luach --checkpoint a bheith ina slánuimhir" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Grúpa neamhbhailí" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Mód neamhbhailí ar rogha" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Uimhir neamhbhailí" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Úinéir neamhbhailí" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Méid taifid neamhbhailí" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Tá líon na mball neamhbhailí" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Ní cheadaítear ach aon rogha --to-command amháin" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Tá an argóint dlúis míchumtha: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Dlús anaithnid: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[COMHAD]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Tá gá le hargóint ar an seanrogha `%c'." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "tá an rogha --occurrence gan bhrí in éagmais liosta comhad" -#: src/tar.c:2241 +#: src/tar.c:2240 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:2271 +#: src/tar.c:2270 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:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Ní féidir --listed-incremental a úsáid le --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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)" @@ -2292,47 +2307,47 @@ 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Ní féidir cartlanna le hiliomad imleabhair a fhíorú" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a fhíorú" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Ní féidir úsáid a bhaint as cartlanna il-ranna comhbhrúite" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a iarcheangal" -#: src/tar.c:2332 +#: src/tar.c:2331 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:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Ní chruthófar cartlann fholamh (go cladhartha)" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Níl na roghanna `-Aru' ar fáil in éineacht le `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Ní foláir rogha amháin de `-Acdtrux' ar a laghad" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2704,6 +2719,9 @@ msgstr "Tá ainmneacha comhaid de dhíth ar --stat" msgid "too many arguments" msgstr "an iomarca argóintí" +#~ 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?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "cealaigh an éifeacht de rogha --delay-directory-restore" diff --git a/po/gl.gmo b/po/gl.gmo index a4a575f..d67ca8a 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 0af525b..ecfb076 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2002-03-26 19:17+0100\n" "Last-Translator: Jacobo Tarrío Barreiro \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -315,11 +315,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "\"" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "\"" @@ -374,7 +374,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -471,6 +471,29 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Informe dos erros no programa a .\n" +"Informe dos erros na traducción a .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -507,16 +530,6 @@ msgstr "" " --version Amosar información da versión.\n" " --help Amosar esta axuda.\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Informe dos erros no programa a .\n" -"Informe dos erros na traducción a .\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -542,103 +555,103 @@ msgstr "Fin de ficheiro prematura" msgid "Garbage command" msgstr "Comando lixo" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Bytes totais escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Bytes totais escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(canalización)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Valor non válido para record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Non se proporcionou o nome do arquivo" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Non se poden verifica-los arquivos da entrada/saída estándar" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Non se poden actualiza-los arquivos comprimidos" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "No comezo da cinta, saíndo agora" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Demasiados erros, saíndo" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contén un número de volume non válido" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Desbordamento no número de volume" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare o volume #%d para %s e prema enter: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Chegouse á fin de ficheiro onde se esperaba unha resposta do usuario" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "AVISO: O arquivo está incompleto" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -650,71 +663,71 @@ msgstr "" " ! Executar outro intérprete de comandos\n" " ? Amosar esta lista\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Non hai novos volumes; saíndo.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "O comando \"%s\" fallou" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s non continúa neste volume" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s ten un tamaño incorrecto (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora da secuencia" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "O arquivo non está etiquetado para coincidir con %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "O volume %s non coincide con %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, 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" @@ -730,7 +743,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fin de ficheiro inesperado no arquivo" @@ -849,7 +862,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 #, fuzzy msgid "contents not dumped" msgstr " (memoria volcada)" @@ -879,7 +892,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -975,126 +988,126 @@ msgstr "%s: Non se pode renomear a %s" msgid "Error is not recoverable: exiting now" msgstr "O erro non é recuperable: sáese agora" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Renomeouse o directorio" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Renomeouse o directorio" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: O directorio é novo" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Marca de tempo non válida" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Proporcionouse na opción un modo non válido" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Número de dispositivo non válido" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Número de inode non válido" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 #, fuzzy msgid "Read error in snapshot file" msgstr "Erro de lectura en %s" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Non se pode eliminar" @@ -1318,87 +1331,87 @@ msgstr "" " nil, existing numera se existen copias de seguridade numeradas\n" " never, simple sempre fai copias de seguridade sinxelas\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Fin de ficheiro inesperado no arquivo" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1406,574 +1419,580 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 #, fuzzy msgid "remove files after adding them to the archive" msgstr "Borrando a especificación de unidade dos nomes do arquivo" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Erro ao gravar na saída estándar" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Non se pode verifica-los arquivos multi-volume" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Arquivar da entrada estándar" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Opcións de compresión conflictivas" -#: src/tar.c:596 +#: src/tar.c:595 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Non se puido escribir no programa de compresión" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" -msgstr "" +#: src/tar.c:597 +#, fuzzy +msgid "do not use archive suffix to determine the compression program" +msgstr "Non se puido escribir no programa de compresión" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: o ficheiro é o arquivo; non se envorca" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: o ficheiro é o arquivo; non se envorca" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Non se pode cambia-lo directorio de traballo" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Eliminadndo o \"%.*s\" inicial dos nomes dos membros" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "O volume %s non coincide con %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1981,279 +2000,275 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 #, fuzzy msgid "ask for confirmation for every action" msgstr "Non se puido le-la confirmación do usuario" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Non pode especificar máis dunha das opcións \"-Acdtrux\"" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Opcións de compresión conflictivas" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " Tipo de ficheiro %s descoñecido\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Non se atopou o ficheiro de data" -#: src/tar.c:1017 +#: src/tar.c:1018 #, 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:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Factor de bloqueo non válido" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Lonxitude da fita non válida" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Máis dunha data de umbral" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Grupo non válido" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Proporcionouse na opción un modo non válido" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Número de inode non válido" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Propietario non válido" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Tamaño de rexistro non válido" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "Lonxitude da fita non válida" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Patrón descoñecido `%s'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "A antiga opción \"%c\" precisa dun argumento." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Varios ficheiros de arquivo requiren a opción \"-M\"" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Non se pode combinar --listed-incremental con --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Non se pode verifica-los arquivos multi-volume" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Non se poden verifica-los arquivos comprimidos" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Non se poden empregar arquivos comprimidos multi-volume" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Non se poden actualiza-los arquivos comprimidos" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "De xeito cobarde rexéitase crear un ficheiro baleiro" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "As opcións \"-Aru\" son incompatibles con \"-f -\"" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Debe especificar unha das opcións \"-Acdtrux\"" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2606,6 +2621,9 @@ msgstr "--Nomes de ficheiro alterados--\n" msgid "too many arguments" msgstr "" +#~ 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?" + #~ msgid "block size" #~ msgstr "tamaño de bloque" diff --git a/po/hr.gmo b/po/hr.gmo index 1858ec8..d1d175a 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index 596b0df..9718718 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -114,11 +114,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -319,11 +319,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -379,7 +379,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -476,6 +476,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Prijavi gre¹ke i bugove na .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -512,15 +534,6 @@ msgstr "" " --version Informacije o verziji programskih ispisa.\n" " --help Ispi¹i ovu pomoæ.\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Prijavi gre¹ke i bugove na .\n" - # FIXME -- find xlation for 'seek offset' -- TM #: rmt/rmt.c:397 #, fuzzy @@ -548,105 +561,105 @@ msgstr "Prerani kraj datoteke" msgid "Garbage command" msgstr "Neispravna naredba" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Ukupno ispisano bajtova: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" # FIXME -- ovo neæe raditi ako je prevedeno -- Denis? -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Ukupno ispisano bajtova: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(cjevovod - pipe)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Pogre¹na vrijednost za record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Nije dano ime arhive" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Ne mogu verificirati stdin/stdout arhive" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Ne mogu a¾urirati komprimirane arhive" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Poèetak trake, zavr¹avam" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Previ¹e pogre¹aka, zavr¹avam" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sadr¾i pogre¹an broj dijela arhive" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Prekoraèenje u broju dijela arhive" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Pripremite dio arhive #%d za %s i pritisni :" -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Naðen EOF gdje sam oèekivao odgovor korisnika" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "UPOZORENJE: Arhiva nije kompletirana" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -658,72 +671,72 @@ msgstr "" " ! Pokreni podljusku operativnog sistema\n" " ? Ispi¹i ovu listu\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Nema novog dijela arhive; zavr¹avam.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "Neuspjela `%s' naredba" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s nije nastavljen za ovom dijelu arhive" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je pogre¹ne velièine (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, 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:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiva nije oznaèena labelom da odgovara %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Dio arhive %s ne odgovara %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -738,7 +751,7 @@ msgstr[1] "Uspio pro msgid "Contents differ" msgstr "Sadr¾aji se razlikuju" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Neoèekivani EOF u arhivi" @@ -858,7 +871,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -887,7 +900,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -985,125 +998,125 @@ msgstr "%s: Ne mogu preimenovati u %s" msgid "Error is not recoverable: exiting now" msgstr "Gre¹ka iz koje se ne mogu oporaviti: zavr¹avam s radom" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktoriju promijenjeno ime" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktoriju promijenjeno ime" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Novi direktorij" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Pogre¹na oznaka vremena" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Pogre¹an mod dan opcijom" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Pogre¹an broj ureðaja" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Pogre¹an inode broj" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekivani EOF u arhivi" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" # FIXME -- blocking factor -- can't translate (ask others) -- TM -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Bri¹em %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ne mogu obrisati" @@ -1327,87 +1340,87 @@ msgstr "" " nil, existing pobrojani ako pobrojani veæ postoje, inaèe jednostavni\n" " never, simple uvijek radi jednostavne backupe\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Neoèekivani EOF u arhivi" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1415,573 +1428,578 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Pogre¹ka u pisanju na standardni izlaz" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" # FIXME -- volume -- find more suitable (ask others) -- TM -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Ne mogu verificirati vi¹edjelne arhive" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Konfliktne opcije formata arhive" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Konfliktne opcije za kompresiju" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: datoteka je arhiva; ne arhiviram ju" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: datoteka je arhiva; ne arhiviram ju" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Ne mogu promijeniti radni direktorij" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Uklanjam vodeæe `%.*s' iz imena èlanova" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "Dio arhive %s ne odgovara %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1989,231 +2007,227 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Konfliktne opcije za kompresiju" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " nepoznat tip datoteke %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Datoteka s datumom nije pronaðena" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Substituiram %s za nepoznat format datuma %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: datoteka je arhiva; ne arhiviram ju" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" # FIXME -- clarify this against source and man -- TM -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Pogre¹an faktor pakiranja u blokove" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Pogre¹na duljina trake" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Vi¹e od jednog datuma s pragom (threshold)" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Pogre¹na grupa" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Pogre¹an mod dan opcijom" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Pogre¹an inode broj" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Pogre¹an vlasnik" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Pogre¹na velièina sloga (record)" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Velièina sloga (record) mora biti vi¹ekratnik %d." -#: src/tar.c:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "Pogre¹na duljina trake" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Stara opcija `%c' zahtijeva obavezan argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Vi¹edjelne arhive zahtijevaju `-M' opciju" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Ne mogu kombinirati --listed-incremental s --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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)" @@ -2221,49 +2235,49 @@ 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Ne mogu verificirati vi¹edjelne arhive" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Ne mogu verificirati komprimirane arhive" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Ne mogu koristiti vi¹edjelne komprimirane arhive" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Ne mogu a¾urirati komprimirane arhive" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" # LOL -- TM -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Kukavièki odbijam kreirati praznu arhivu!" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opcije `-Aru' nisu kompatibilne s `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Morate specificirati jednu od `-Acdtrux' opcija" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2617,6 +2631,9 @@ msgstr "--Manglirana imena datoteka--\n" msgid "too many arguments" msgstr "" +#~ 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?" + #~ msgid "block size" #~ msgstr "velièina bloka" diff --git a/po/hu.gmo b/po/hu.gmo index 3ebc393..e444233 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index 89fb7d7..ab792f3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.20\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2008-05-11 16:11+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -84,7 +84,7 @@ msgstr "" "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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "A hibák a(z) %s címen jelenthetők.\n" @@ -93,15 +93,15 @@ msgstr "A hibák a(z) %s címen jelenthetők.\n" msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "ezen súgószöveg megjelenítése" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 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:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: 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:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "szünet MP másodpercre (alapértelmezetten 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "a programverzió kiírása" @@ -319,11 +319,11 @@ msgstr "Egy . helyettesítése a közvetlen link üres célja helyett" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "”" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "”" @@ -375,10 +375,11 @@ msgid "(C)" msgstr "(C)" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -498,6 +499,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s, és mások.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"A programhibákat a(z) <%s> címen jelentheted.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "A bemeneti karakterlánc túl hosszú" @@ -535,15 +558,6 @@ msgstr "" " --version Kiírja a verzióinformációkat\n" " --help Ezen súgó megjelenítése\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"A programhibákat a(z) <%s> címen jelentheted.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Keresésieltolás-hiba" @@ -568,104 +582,104 @@ msgstr "Idő előtti fájlvége" msgid "Garbage command" msgstr "Fölösleges parancs" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Kiírt bájtok teljes száma" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Olvasott bájtok teljes száma" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Törölt bájtok teljes száma: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(cső)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "A record_size értéke érvénytelen" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Nem adott meg archívumnevet" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Nem ellenőrizhető az archívum, ha a szabványos be/kimenetet használja" -#: src/buffer.c:536 +#: src/buffer.c:538 #, 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:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Tömörített archívumok nem frissíthetők" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "A szalag eleje, most kilépek" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Túl sok hiba, kilépek" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "az rmtlseek nem állt meg egy rekord határán" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: érvénytelen kötetszámot tartalmaz" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Kötetszám-túlcsordulás" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF ahol a program felhasználói választ várt" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "FIGYELMEZTETÉS: Az archívum befejezetlen" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -676,67 +690,67 @@ msgstr "" " q A Tar megszakítása\n" " y vagy újsor A művelet folytatása\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Új parancsértelmező hívása\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Ezen lista kiírása\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Nincs új kötet, kilépés.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Nincs megadva fájlnév, próbálkozzon újra.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, 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:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "A(z) „%s” parancs meghiúsult" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s nem folytatódik ezen a köteten" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s mérete hibás (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, 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:1301 +#: src/buffer.c:1303 #, 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:1304 +#: src/buffer.c:1306 #, 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:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -744,7 +758,7 @@ msgstr "" "%s: a fájlnév túl hosszú egy GNU többkötetes fejlécben való tároláshoz, " "csonkításra került" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "az rmtlseek nem állt meg egy rekord határán" @@ -760,7 +774,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Váratlan EOF az archívumban" @@ -882,7 +896,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "a tartalom nem került kiírásra" @@ -911,7 +925,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "a könyvtár nem került kiírásra" @@ -1005,127 +1019,127 @@ msgstr "%s: Nem nevezhető át a következőre: %s" msgid "Error is not recoverable: exiting now" msgstr "A hiba nem hozható helyre: kilépés" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, 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:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: a könyvtár át lett nevezve" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: a könyvtár új" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Érvénytelen időbélyeg" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Érvénytelen módosítási idő (másodperc)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Érvénytelen módosítási idő (nanomásodperc)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Érvénytelen eszközszám" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Érvénytelen inode-szám" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Túl hosszú mező a pillanatképfájl olvasása közben" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Olvasási hiba a pillanatképfájlban" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Váratlan fájlvége a pillanatképfájlban" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Váratlan mezőérték a pillanatképfájlban" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Hiányzó rekordlezáró" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Hibás növekményes fájlformátum" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nem támogatott növekményes formátumverzió: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Rosszul formázott kiíratási könyvtár: a várt „%c” helyett %#3o található" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Rosszul formázott kiíratási könyvtár: az „X” többször szerepel" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Rosszul formázott kiíratási könyvtár: üres név az „R”-ben" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Rosszul formázott kiíratási könyvtár: a „T”-t nem előzi meg az „R”" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Rosszul formázott kiíratási könyvtár: üres név a „T”-ben" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Rosszul formázott kiíratási könyvtár: a várt „%c” helyett az adatok vége " "található" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" "Rosszul formázott kiíratási könyvtár: az „X” soha nem került felhasználásra" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, 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:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s törlése\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: nem távolítható el" @@ -1355,88 +1369,88 @@ msgstr "" " egyébként egyszerű\n" " never, simple mindig egyszerű mentés létrehozása\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Fő működési mód:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "felsorolja egy archívum tartalmát" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "fájlok kibontása egy archívumból" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "új archívum létrehozása" -#: src/tar.c:381 +#: src/tar.c:380 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:384 +#: src/tar.c:383 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:386 +#: src/tar.c:385 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:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "tar fájlok hozzáfűzése egy archívumhoz" -#: src/tar.c:391 +#: src/tar.c:390 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:393 +#: src/tar.c:392 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:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Műveletmódosítók:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "ritka fájlok hatékony kezelése" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAGAS[.ALACSONY]" -#: src/tar.c:403 +#: src/tar.c:402 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:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "régi GNU formátumú növekményes mentés kezelése" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FÁJL" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "új GNU formátumú növekményes mentés kezelése" -#: src/tar.c:409 +#: src/tar.c:408 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:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "SZÁM" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1449,119 +1463,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "az archívum kereshető" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "ne ellenőrizze az eszközszámokat növekményes archívumok létrehozásakor" -#: src/tar.c:422 +#: src/tar.c:421 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:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Felülírás felügyelete:" -#: src/tar.c:431 +#: src/tar.c:430 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:433 +#: src/tar.c:432 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:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "ne cserélje a meglévő fájlokat kibontáskor" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "meglévő fájlok felülírása kibontáskor" -#: src/tar.c:441 +#: src/tar.c:440 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:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "hierarchiák kiürítése könyvtár kibontása előtt" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "meglévő könyvtárak metaadatainak megőrzése" -#: src/tar.c:447 +#: src/tar.c:446 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:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Kimeneti adatfolyam kiválasztása:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "fájlok kibontása a szabványos kimenetre" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "PARANCS" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "kibontott fájlok továbbítása másik program számára" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "utódok kilépési kódjainak figyelmen kívül hagyása" -#: src/tar.c:462 +#: src/tar.c:461 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:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Fájlattribútumok kezelése:" -#: src/tar.c:470 +#: src/tar.c:469 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:472 +#: src/tar.c:471 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:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DÁTUM-VAGY-FÁJL" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "MÓDOSÍTÁSOK" -#: src/tar.c:476 +#: src/tar.c:475 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:478 +#: src/tar.c:477 msgid "METHOD" msgstr "MÓDSZER" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1571,29 +1585,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:483 +#: src/tar.c:482 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:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "próbálja azonos tulajdonossal kibontani a fájlokat" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "fájlok kibontása az Ön nevében" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "mindig számok használata a felhasználó- vagy csoportnevekhez" -#: src/tar.c:491 +#: src/tar.c:490 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:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1601,15 +1615,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:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "kibontandó nevek rendezése, az archívumnak való megfelelés érdekében" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "azonos, mint a -p és -s egyszerre" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1617,139 +1631,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:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "a --delay-directory-restore kapcsoló hatásának megszüntetése" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Eszköz kiválasztása és váltása:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHÍVUM" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "az ARCHÍVUM archívumfájl vagy -eszköz használata" -#: src/tar.c:515 +#: src/tar.c:514 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "az adott rmt PARANCS használata az rmt helyett" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "a távoli PARANCS használata az rsh helyett" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "meghajtó és sűrűség megadása" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "többkötetes archívum létrehozása/listázása/kibontása" -#: src/tar.c:539 +#: src/tar.c:538 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:541 +#: src/tar.c:540 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:544 +#: src/tar.c:543 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:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Eszközblokkolás:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOKK" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "rekordonként BLOKK x 512 bájt" -#: src/tar.c:554 +#: src/tar.c:553 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:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "nullázott blokkok (EOF) mellőzése az archívumban" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "újrablokkolás olvasáskor (4.2BSD csövekhez)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Archívumformátum kiválasztása:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMÁTUM" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "az adott formátumú archívum létrehozása" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "A FORMÁTUM a következők egyike:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "régi V7 tar formátum" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "A tar <= 1.12 által használt GNU formátum" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x formátum" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) formátum" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) formátum" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "azonos a pax formátummal" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "azonos a --format=v7 formátummal" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "azonos a --format=posix formátummal" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "kulcsszó[[:]=érték][,kulcsszó[[:]=érték]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "a pax kulcsszavak irányítása" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "SZÖVEG" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1757,101 +1771,106 @@ 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:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Tömörítési kapcsolók:" -#: src/tar.c:596 +#: src/tar.c:595 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:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" +msgid "do not 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 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "az archívum tömörítése a bzip2 használatával" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "az archívum tömörítése a gzip használatával" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "az archívum tömörítése a compress használatával" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "az archívum tömörítése az lzma használatával" -#: src/tar.c:612 +#: src/tar.c:611 #, 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 +#, fuzzy +msgid "filter the archive through xz" +msgstr "az archívum tömörítése a gzip használatával" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 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:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Helyi fájlválasztás:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "KÖNYVTÁR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "váltás a KÖNYVTÁR könyvtárba" -#: src/tar.c:626 +#: src/tar.c:627 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:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "a -T nullal lezárt neveket olvas, letiltja a -C kapcsolót" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 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:634 +#: src/tar.c:635 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:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "MINTA" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "a MINTAKÉNT megadott fájlok kihagyása" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "a FÁJLBAN megadott minták kihagyása" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1859,92 +1878,92 @@ msgstr "" "a CACHEDIR.TAG-et tartalmazó könyvtárak tartalmának kihagyása, a címkefájl " "kivételével" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak alatt minden kihagyása" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak kihagyása" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "a FÁJLT tartalmazó könyvtárak alatt minden kihagyása" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "a FÁJLT tartalmazó könyvtárak kihagyása" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "verziókezelő-könyvtárak kihagyása" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "ne lépjen be automatikusan a könyvtárakba" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "az archívum létrehozásakor maradjon a helyi fájlrendszeren" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "belépés a könyvtárakba rekurzívan (alapértelmezett)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "ne vágja le a kezdő „/” jelet a fájlnevekből" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "TAGNÉV" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "kezdés a TAGNÉV tagnál az archívumban" -#: src/tar.c:671 +#: src/tar.c:672 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:673 +#: src/tar.c:674 msgid "DATE" msgstr "DÁTUM" -#: src/tar.c:674 +#: src/tar.c:675 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:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "FELÜGYELET" -#: src/tar.c:676 +#: src/tar.c:677 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:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "KARAKTERLÁNC" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1952,94 +1971,94 @@ msgstr "" "mentés eltávolítás előtt, a szokásos utótag („~”, hacsak a " "SIMPLE_BACKUP_SUFFIX környezeti változó nem bírálja felül) felülbírálása" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Fájlnév-átalakítások:" -#: src/tar.c:685 +#: src/tar.c:686 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "KIFEJEZÉS" -#: src/tar.c:688 +#: src/tar.c:689 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:694 +#: src/tar.c:695 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:697 +#: src/tar.c:698 msgid "ignore case" msgstr "kis- és nagybetűk figyelmen kívül hagyása" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "a minták illesztése a fájlnevek elejére" -#: src/tar.c:701 +#: src/tar.c:702 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:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "kis- és nagybetűkre érzékeny illesztés (alapértelmezett)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "helyettesítő karakterek használata (alapértelmezett kihagyáskor)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "szó szerinti karakterlánc-illesztés" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "a helyettesítő karakterek nem illeszkednek a perjelre" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" "a helyettesítőkarakterek illeszkednek a „/” jelre (alapértelmezett " "kihagyáskor)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Informatív kimenet:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "feldolgozott fájlok bőbeszédű listázása" -#: src/tar.c:721 +#: src/tar.c:722 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "MÅ°VELET" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "a MÅ°VELET végrehajtása minden ellenőrzőponton" -#: src/tar.c:727 +#: src/tar.c:728 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:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SZIGNÁL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2051,27 +2070,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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "a fájlmódosítási dátumok kiírása UTC szerint" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "bőbeszédű kimenet küldése a FÁJLBA" -#: src/tar.c:738 +#: src/tar.c:739 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:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "megerősítés kérése minden egyes művelethez" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "a tar alapértelmezéseinek megjelenítése" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2079,31 +2098,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:747 +#: src/tar.c:748 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:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STÍLUS" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "a KARAKTERLÁNCBÓL származó karakterek kiegészítő idézése" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "a KARAKTERLÁNCBÓL származó karakterek idézésének letiltása" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Kompatibilitási kapcsolók:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2111,56 +2130,56 @@ msgstr "" "létrehozáskor megegyezik a --old-archive kapcsolóval; kibontáskor a --no-" "same-owner kapcsolóval" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Egyéb kapcsolók:" -#: src/tar.c:771 +#: src/tar.c:772 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:919 +#: src/tar.c:920 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”" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "A tömörítési kapcsolók ütköznek" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Ismeretlen szignálnév: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "A dátummintafájl nem található" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s cseréje az ismeretlen %s dátumformátumhoz" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "„%s” kapcsoló: A(z) „%s” dátum kezelése mint %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: a fájllista már be van olvasva" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: a beolvasott fájlnév null karaktert tartalmaz" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "A --quoting-style kapcsolók érvényes argumentumai:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2168,166 +2187,160 @@ msgstr "" "\n" "*Ezen* tar alapértelmezései:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Érvénytelen blokkolási tényező" -#: 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?" - -#: src/tar.c:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Érvénytelen szalagméret" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Egynél több küszöbdátum" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Érvénytelen ritka verzió érték" -#: src/tar.c:1585 +#: src/tar.c:1584 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:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "A --checkpoint értéke nem egy egész" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Érvénytelen csoport" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Érvénytelen mód került megadásra a kapcsolóban" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Érvénytelen szám" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Érvénytelen tulajdonos" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Érvénytelen rekordméret" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Érvénytelen elemszám" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Csak egy --to-command kapcsoló engedélyezett" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Rosszul formázott sűrűségargumentum: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Ismeretlen sűrűség: „%c”" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "A „-[0-7][lmh]” kapcsolókat *ez* a tar NEM támogatja" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FÁJL]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "A régi „%c” kapcsoló paramétert igényel." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "a --occurrence értelmetlen fájllista nélkül" -#: src/tar.c:2241 +#: src/tar.c:2240 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:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Több archívumfájl esetén szükséges a „-M” kapcsoló" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "" "A --listed-incremental és a --newer kapcsolók nem használhatók egyszerre" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "A többkötetes archívumok nem ellenőrizhetők" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "A tömörített archívumok nem ellenőrizhetők" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Nem használhatók többkötetes tömörített archívumok" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Tömörített archívumok nem fűzhetők össze" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "a --pax kapcsoló csak POSIX archívumokon használható" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Üres archívum létrehozása visszautasítva" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Az „-Aru” kapcsolók összeférhetetlenek a „-f” kapcsolóval" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "A következő kapcsolók közül egyikét meg kell adnia: „-Acdtrux”" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2702,6 +2715,11 @@ msgstr "a --stat fájlneveket igényel" msgid "too many arguments" msgstr "túl sok argumentum" +#~ 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?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "a --delay-directory-restore kapcsoló hatásának megszüntetése" diff --git a/po/id.gmo b/po/id.gmo index 7d38bc9..04860ac 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index fa65a8e..a86f4c9 100644 --- a/po/id.po +++ b/po/id.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: tar 1.20\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-11-09 16:15+0700\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2008-12-30 12:30+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" @@ -82,7 +82,7 @@ msgstr " [OPSI...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Coba `%s --help' atau `%s --usage' untuk informasi lebih lanjut.\n" -#: lib/argp-help.c:1710 src/tar.c:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "Laporkan bug ke %s.\n" @@ -91,15 +91,15 @@ msgstr "Laporkan bug ke %s.\n" msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "berikan daftar bantuan ini" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "berikan sebuah pesan penggunaan singkat" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NAMA" @@ -112,11 +112,11 @@ msgstr "set nama aplikasi" msgid "SECS" msgstr "SECS" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "berhenti untuk DETIK detik (baku 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "tampilkan versi aplikasi" @@ -313,11 +313,11 @@ msgstr "Mengganti `.' untuk target hard link kosong" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -369,10 +369,11 @@ msgid "(C)" msgstr "(C)" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -494,6 +495,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s, dan yang lainnya.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Laporkan bug ke <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Masukan string terlalu panjang" @@ -530,15 +553,6 @@ msgstr "" " --version Tampilkan informasi versi.\n" " --help Tampilkan bantuan ini.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Laporkan bug ke <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Offset pencarian error" @@ -563,103 +577,103 @@ msgstr "Akhir dari berkas prematur" msgid "Garbage command" msgstr "Perintah sampah" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: src/delete.c:210 src/list.c:167 src/update.c:165 msgid "This does not look like a tar archive" msgstr "Ini sepertinya bukan sebuah tar archive" -#: src/buffer.c:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Total byte ditulis" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Total byte dibaca" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Total byte dihapus: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Nilai record_size tidak valid" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Tidak diberikan nama archive" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Tidak dapat memverifikasi stdin/stdout archive" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archive terkompres. Gunakan %s opsi" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Tidak dapat update compressed archives" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Berada pada awal tape, berhenti sekarang" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Terlalu banyak errors, berhenti" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek tidak dapat berhenti di sebuah batas rekaman" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: berisi nomor volum yang tidak valid" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Nomor volum overflow" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Mempersiapkan volume #%d untuk %s dan tekan return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF pada saat user reply diharapkan" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "PERINGATAN: Archive tidak lengkap" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -671,65 +685,65 @@ msgstr "" " q Batalkan tar\n" " y or newline Lanjutkan operasi\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Spawn sebuah subshell\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Tampilkan daftar ini\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Tidak ada new volume; keluar.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Nama berkas tidak dispesifikasikan. Coba lagi.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Masukan tidak valid. Ketik ? untuk bantuan.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "Perintah %s gagal" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s mungkin dilanjutkan di volume ini: header berisi nama terpotong" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s tidak dilanjutkan di volume ini" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s adalah ukuran yang salah (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Volume ini di luar urutan" +msgstr "Volume ini di luar urutan (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Label archive tidak cocok dengan %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Volume %s tidak sesuai dengan %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -737,10 +751,9 @@ msgstr "" "%s: nama berkas terlalu panjang untuk diurutkan dalam sebuah GNU multivolume " "header, dipotong" -#: src/buffer.c:1619 -#, fuzzy +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek tidak dapat berhenti di sebuah batas rekaman" +msgstr "tulis tidak berhenti di batas blok" #: src/compare.c:96 #, c-format @@ -753,7 +766,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Unexpected EOF dalam archive" @@ -872,7 +885,7 @@ msgstr[1] "%s: File diperkecil %s byte; dipadding dengan nol" 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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "isi tidak didump" @@ -901,7 +914,7 @@ msgstr "%s: berkas adalah archive; tidak di-dump" msgid "%s: File removed before we read it" msgstr "%s: File dihapus sebelum kita membacanya" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "direktori tidak didump" @@ -996,122 +1009,122 @@ msgstr "Tidak dapat mengubah nama %s ke %s" msgid "Error is not recoverable: exiting now" msgstr "Error tidak dapat diperbaiki: keluar sekarang" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktori telah diubah nama dari %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah diganti nama" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktori adalah baru" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Time stamp tidak valid" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Waktu modifikasi (detik) tidak valid" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "waktu modifikasi (nano detik) tidak valid" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Nomor perangkat tidak valid" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Nomor inode tidak valid" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Field terlalu panjang ketika membaca berkas snapshot" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Pembacaan error dalam berkas snapshot" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Tidak terduga EOF dalam berkas snapshot" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Tidak terduga nilai field dalam berkas snapshot" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Hilang pengakhir rekaman" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Format berkas incremental buruk" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Versi format incremental tidak didukung: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Salah bentuk dumpdir: 'X' terduplikasi" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Salah bentuk dumpdir: nama kosong dalam 'R'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Salah bentuk dumpdir: 'T' tidak diawali oleh 'R'" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Salah bentuk dumpdir: nama kosong dalam 'T'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan akhir dari data" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Salah bentuk dumpdir: 'X' tidak pernah digunakan" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Tidak dapat membuat direktori sementara menggunakan template %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Tidak menghapus direktori: tidak dapat memperoleh statistik" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: direktori berada di perangkat yang berbeda: tidak menghapus" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Menghapus %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Tidak dapat menghapus" @@ -1334,87 +1347,87 @@ msgstr "" "sebaliknya\n" " never, simple selalu buat sederhana backups\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Mode operasi utama:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "daftar isi dari sebuah archive" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "ekstrak berkas dari sebuah archive" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "buat sebuah archive baru" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "cari perbedaan diantara archive dan sistem berkas" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "tambahkan berkas ke akhir dari sebuah archive" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "hanya tambahkan berkas yang lebih bari dari salinan dalam archive" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "tambahkan berkas tar ke sebuah archive" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "hapus dari archive (bukan dalam pita mag!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "test label volume archive dan keluar" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Pemodifikasi operasi:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "tangani berkas sparse secara efisien" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "set versi dari format sparse untuk digunakan (mengimplikasikan --sparse)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "tangani format GNU lama incremental backup" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "BERKAS" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "tangani format GNU barus incremental backup" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "jangan keluar dengan bukan nol dalam berkas tidak dapat dibaca" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NOMOR" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1426,119 +1439,119 @@ msgstr "" "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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "pencarian tidak dapat dilakukan dalam archive" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" "tidak dapat memeriksa nomor perangkat ketika membuat archive incremental" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "periksa nomor perangkat ketika membuat incremental archive (baku)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Overwrite kontrol:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "mencoba untuk memverifikasi archive setelah menulisnya" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "hapus berkas setelah menambahkannya ke archive" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "jangan timpa berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "overwrite berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "hapus setiap berkas sebelum mengekstrak diatasnya" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "kosongkan susunan sebelum mengekstrak ke direktori" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "jaga metadata dari direktori yang sudah ada" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "overwrite metadata dari direktori yang sudah ada ketika mengekstrak (baku)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Pilih stream keluaran:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "ekstrak berkas ke standar keluaran" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "PERINTAH" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "pipe berkas terekstrak ke aplikasi lain" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "abaikan kode keluaran dari anak" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "perlakukan kode keluaran bukan nol dari anak sebagai error" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Penanganan dari atribut berkas:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "paksa NAMA sebagai pemilik untuk berkas yang ditambahkan" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "paksa NAMA sebagai grup untuk berkas yang ditambahkan" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATE-ATAU-BERKAS" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "set mtime untuk berkas yang ditambahkan dari DATE-OR-FILE" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "PERUBAHAN" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "paksa PERUBAHAN (simbolik) mode untuk berkas yang ditambahkan" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METODE" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1548,27 +1561,27 @@ msgstr "" "setelah membaca (METODE='replace'; baku) atau dengan tidak menset waktu di " "tempat pertama (METODE='system')" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "jangan ekstrak waktu modifikasi berkas" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "mencoba mengekstrak berkas dengan kepemilikan yang sama" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "ekstrak berkas seperti dirimu" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "selalu gunakan nomor untuk nama pengguna/grup" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "ekstrak informasi mengenai ijin berkas (baku untuk superuser)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1576,15 +1589,15 @@ msgstr "" "aplikasikan umask pengguna ketika mengekstrak ijin dari archive (baku untuk " "pengguna biasa)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "urutkan nama untuk mengekstrak supaya cocok dengan archive" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "sama seperti baik -p dan -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1592,139 +1605,139 @@ msgstr "" "tunda konfigurasi waktu modifikasi dan ijin untuk direktori terekstrak " "sampai akhir dari ekstrasi" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "batalkan efek dari opsi --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Pemilihan dan pengubahan perangkat:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "gunakan berkas archive atau perangkat ARCHIVE" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "berkas archive adalah lokal walaupun ini memiliki sebuah kolon" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "gunakan PERINTAH rmt yang diberikan daripad rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "gunakan PERINTAH remote daripada rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "spesifikasikan drive dan kepadatan" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "buat/daftar/ekstrak multi-volume archive" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "ubah pita setelah menulis ANGKA x 1024 bytes" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "jalankan script di akhir dari setiap pite (mengimplikasikan -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "gunakan/update jumlah volume dalam BERKAS" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Bloking perangkat:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOK" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOK x 512 byte per detik" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "JUMLAH dari byte per rekaman, kelipatan dari 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "abaikan blok yang dinolkan dalam archive (berarti EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "reblok saat kita baca (untuk 4.2BSD pipes)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Pemilihan format archive:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "buat archive dari format yang diberikan" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMAT adalah satu dari berikut:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "format tar lama V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "format gnu tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "format GNU tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "format POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "sama seperti pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "sama seperti --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "sama seperti --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "kata kunci[[:]=nilai][,kata kunci[[:]=nilai]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "kontrol kata kunci pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEKS" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1732,99 +1745,103 @@ msgstr "" "buat archive dengan nama volume TEKS; di waktu daftar/ekstrak, gunakan TEKS " "sebagai sebuah pola globbing untuk nama volume" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Opsi kompresi:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "gunaka nama akhiran archive untuk menentukan aplikasi kompresi" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" -msgstr "gunaka nama akhiran archive untuk menentukan aplikasi kompresi" +msgid "do not use archive suffix to determine the compression program" +msgstr "jangan gunakan nama akhiran archive untuk menentukan aplikasi kompresi" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "saring archive melalui bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "saring archive melalui gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "saring archive melalui compress" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "saring archive melalui lzma" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "saring archive melalui gzip" +msgstr "saring archive melalui lzop" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "saring archive melalui gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "saring melalui PROG (harus menerima -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Pemilihan berkas lokal:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "DIR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "pindah ke direktori DIR" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "dapatkan nama untuk ekstrak atau buat dari BERKAS" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T baca nama berakhiran kosong, non-aktifkan -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "non-aktifkan efek dari opsi --null sebelumnya" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "unquote nama berkas baca dengan -T (baku)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "jangan unquote nama berkas baca dengan -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "POLA" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "jangan masukan berkas, berikan sebagai sebuah POLA" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "jangan masukan pola yang terdaftar dalam BERKAS" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1832,89 +1849,89 @@ msgstr "" "jangan masukan isi dari direktori berisi CACHEDIR.TAG, kecuali untuk berkas " "tag itu sendiri" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "jangan masukan apapun dibawah direktori berisi CACHEDIR.TAG" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "jangan masukan direktori berisi CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "jangan masukan apapun dibawah direktori berisi BERKAS" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "jangan masukan direktori berisi BERKAS" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "jangan masukan direktori sistem pengontrol direktori" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "hindari penurunan secara otomatis dalam direktori" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "tetap dalam sistem berkas lokal ketika membuat archive" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "rekursif kedalam direktori (baku)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "jangan hilangkan awalan `/' dari nama berkas" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "ikuti symlinks; berkas archive dan dump yang mereka tunjuk ke" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "ikuti hard links; berkas archive dan dump yang mereka refer ke" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "NAMA-ANGGOTA" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "berawal di anggota NAMA-ANGGOTA dalam archive" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "hanya simpan berkas lebih baru dari DATE-OR-FILE" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "TANGGAL" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "bandingkan tanggal dan waktu hanya ketika data berubah" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "KONTROL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "backup sebelum penghapusan, pilih PENGONTROL versi" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "STRING" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1922,88 +1939,88 @@ msgstr "" "backup sebelum penghapusan, override akhiran biasa ('~' kecuali di override " "oleh variabel lingkungan SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Transformasi nama berkas:" -#: src/tar.c:685 +#: src/tar.c:686 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "EKSPRESI" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "gunakan sed EKSPRESI replace untuk mengubah nama berkas" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Opsi nama berkas cocok (mempengaruhi baik pola exclude dan include):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "abaikan perbedaan huruf besar dan huruf kecil" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "pencocokan pola nama berkas mulai" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "pencocokan polah setelah `/' apapun (baku untuk exclusion)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "pencocokan dengan memperhatikan huruf besar dan huruf kecil (baku)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "gunakan wildcards (baku untuk exclusion)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "pencocok verbatim string" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "wildcards tidak cocok `/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "wildcards cocok `/' (baku untuk exclusion)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Keluaran informative:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "proses daftar berkas secara verbose" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "tampilkan pesan perkembangan setiap rekaman ke ANGKA (baku 10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "AKSI" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "jalankan AKSI disetiap titik pemeriksaan" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "tampilkan sebuah pesan jika tidak seluruh link didump" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SINYAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2015,27 +2032,27 @@ msgstr "" "adalah: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 dan SIGUSR2; nama tanpa awalah SIG " "juga diterima" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "tampilkan waktu modifikasi berkas dalam UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "kirim keluaran verbose ke BERKAS" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "tampilkan jumlah blok didalam archive dengan setiap pesan" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "minta konfirmasi untuk setiap aksi" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "tampilkan tar baku" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2043,31 +2060,31 @@ msgstr "" "ketika mendaftar atau mengekstrak, daftar setiap direktori yang tidak cocok " "dengan kriteria pencarian" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "tampilkan berkas atau nama berkas setelah transformasi" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "GAYA" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "set nama quoting gaya; lihat dibawah untuk nilai GAYA yang valid" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "sebagai tambahan karakter quote dari STRING" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "non-aktifkan quoting untuk karakter dari STRING" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Opsi yang kompatibel:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2075,56 +2092,56 @@ msgstr "" "ketika membuat, sama seperti --old-archive; ketika mengekstrak, sama seperti " "--no-same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Opsi lain:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "non-aktifkan penggunaan dari opsi berbahaya yang berpotensial" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Anda tidak bisa menjalankan lebih dari satu opsi `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Opsi kompresi konflik" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Nama sinyal: %s tidak dikenal" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Tanggal contoh berkas tidak ditemukan" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Menggantikan %s untuk format tanggal tidak dikenal %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Opsi %s: memperlakukan tanggal `%s' sebagai %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: daftar berkas telah dibaca" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: nama berkas yang dibaca berisi karakter nul" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Argumen yang valid untuk opsi --quoting-style adalah:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2132,165 +2149,163 @@ msgstr "" "\n" "*Ini* tar baku ke:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Faktor bloking tidak valid" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Panjang tape tidak valid" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Lebih dari satu treshold date" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Nilai versi sparse tidak valid" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "opsi --atime-preserve='system' tidak didukung di platform ini" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "nilai --checkpoint bukan sebuah integer" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: grup tidak valid" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Mode tidak tepat diberikan pada opsi" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Nomor tidak valid" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Pemilik tidak valid" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"Opsi --preserve sudah ditinggalkan, lebih baik gunakan --preserve-" +"permissions --preserve-order" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Ukuran record tidak valid" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Jumlah record harus kelipatan dari %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Jumlah dari elemen tidak valid" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Hanya satu opsi --to-command yang diijinkan" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Salah bentuk kepadatan argumen: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Kepadatan tidak diketahui: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[BERKAS]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Opsi 'lama' `%c' membutuhkan argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence tidak berarti tanpa sebuah daftar berkas" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence tidak dapat digunakan dalam mode operasi yang diminta" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Berkas multiple archive membutuhkan opsi '-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Tidak dapat menggabungkan --listed-incremental dengan --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Tidak dapat verifikasi multi-volume archives" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Tidak dapat verify compressed archives" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Tidak dapat menggunakan multi-volume compressed archives" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Tidak dapat update compressed archives" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option hanya dapat digunakan dalam archive POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "Panjang volume tidak dapat lebih kecil dari ukuran rekaman" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "--preserve-order tidak kompatibel dengan --listed-incremental" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Secara takut menolak untuk membuat sebuah archive kosong" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opsi '-Aru' tidak kompatibel dengan `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Anda harus menggunakan salah satu dari opsi `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Keluar dengan status gagal karena error error sebelumnya" #: src/update.c:86 #, c-format @@ -2556,12 +2571,12 @@ msgstr "stat(%s) gagal" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "panjang berkas yang diminta %lu, sebenernya %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "pembuatan berkas tidak sparse" #: tests/genfile.c:353 #, c-format @@ -2654,6 +2669,10 @@ msgstr "--stat membutuhkan nama berkas" msgid "too many arguments" msgstr "terlalu banyak argumen" +#~ 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?" + #~ msgid "Error exit delayed from previous errors" #~ msgstr "Kesalahan exit ditunda dari error sebelumnya" diff --git a/po/it.gmo b/po/it.gmo index 49aeb33..23c5127 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index c227b4b..ed85742 100644 --- a/po/it.po +++ b/po/it.po @@ -1,18 +1,18 @@ # Italian translation of GNU tar. -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # # Lele Gaifax , 1996. # Marco d'Itri , 1998. -# Milo Casagrande , 2008 +# Milo Casagrande , 2008-2009 # msgid "" msgstr "" -"Project-Id-Version: tar 1.20\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\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" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2009-01-15 21:46+0100\n" +"Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,7 +84,7 @@ msgstr " [OPZIONE...]" msgid "Try `%s --help' or `%s --usage' for more information.\n" msgstr "Usare \"%s --help\" o \"%s --usage\" per ulteriori informazioni.\n" -#: lib/argp-help.c:1710 src/tar.c:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "Segnalare i bug a %s.\n" @@ -93,15 +93,15 @@ msgstr "Segnalare i bug a %s.\n" msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "Mostra questo aiuto" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "Mostra un breve messaggio sull'uso" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NOME" @@ -114,11 +114,11 @@ msgstr "Imposta il nome del programma" msgid "SECS" msgstr "SEC" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "Resta in attesa per SEC secondi (predefinito 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "Stampa la versione del programma" @@ -317,11 +317,11 @@ msgstr "Sostituzione di \".\" all'obiettivo vuoto di un collegamento fisico" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "\"" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "\"" @@ -333,7 +333,7 @@ msgstr "\"" #. locale -k LC_MESSAGES | grep '^yesexpr=' #: lib/rpmatch.c:147 msgid "^[yY]" -msgstr "^[sSyY]" +msgstr "^[sSyY].*" #. TRANSLATORS: A regular expression testing for a negative answer #. (english: "no"). Testing the first character may be sufficient. @@ -343,7 +343,7 @@ msgstr "^[sSyY]" #. locale -k LC_MESSAGES | grep '^noexpr=' #: lib/rpmatch.c:160 msgid "^[nN]" -msgstr "^[nN]" +msgstr "^[nN].*" #: lib/rtapelib.c:299 #, c-format @@ -373,10 +373,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -497,6 +498,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s e altri.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Segnalare i bug a <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Stringa di input troppo lunga" @@ -533,15 +556,6 @@ msgstr "" " --version Mostra le informazioni sulla versione.\n" " --help Mostra questo aiuto.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Segnalare i bug a <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Errore offset di seek" @@ -556,7 +570,7 @@ msgstr "Direzione di seek fuori dell'intervallo" #: rmt/rmt.c:472 msgid "rmtd: Premature eof\n" -msgstr "rmtd: prematura fine del file\n" +msgstr "rmtd: EOF prematuro\n" #: rmt/rmt.c:474 msgid "Premature end of file" @@ -566,105 +580,105 @@ msgstr "Prematura fine del file" msgid "Garbage command" msgstr "Comando spazzatura" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Byte totali scritti" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Byte totali letti" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Byte totali eliminati: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Valore di record_size non valido" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Non è stato indicato il nome di un archivio" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Impossibile verificare archivi su stdin/stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "L'archivio è compresso. Usare l'opzione %s." -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Impossibile aggiornare archivi compressi" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "All'inizio del nastro, uscita immediata" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Troppi errori, uscita" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Impossibile muoversi all'indietro nel file dell'archivio; potrebbe non " "essere\n" "leggibile senza l'opzione -i" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" -msgstr "rmtlseek non si è fermato al limite di un record" +msgstr "rmtlseek non si è fermata al limite di un record" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contiene un numero di volume non valido" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Overflow del numero di volume" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Preparare il volume #%d per %s e premere Invio: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Ricevuto EOF quando era attesa la risposta dell'utente" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "Attenzione: l'archivio non è completo" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -676,67 +690,67 @@ msgstr "" " q Termina tar\n" " y o Invio Continua l'operazione\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Esegue una subshell\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Stampa questo elenco\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Nessun nuovo volume; uscita.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Nome file non specificato. Riprovare.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Input non valido. Premere ? per l'aiuto.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "comando \"%s\" non riuscito" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s potrebbe continuare su questo volume: l'intestazione contiene un nome " "troncato" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s non continua su questo volume" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s è la dimensione sbagliata (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Questo volume è fuori sequenza" +msgstr "Questo volume è fuori sequenza (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "L'archivio non ha un'etichetta corrispondente a %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Il volume %s non corrisponde a %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -744,10 +758,9 @@ msgstr "" "%s: il nome del file è troppo lungo per essere scritto in un'intestazione " "GNU multi-volume, troncato" -#: src/buffer.c:1619 -#, fuzzy +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek non si è fermato al limite di un record" +msgstr "write non si è fermata al limite di un record" #: src/compare.c:96 #, c-format @@ -760,7 +773,7 @@ msgstr[1] "È stato possibile leggere solo %lu byte di %lu" msgid "Contents differ" msgstr "I contenuti sono differenti" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "EOF inatteso nell'archivio" @@ -879,7 +892,7 @@ msgstr[1] "%s: file ristretto di %s byte; riempito con zeri" 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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "contenuti non archiviati" @@ -908,7 +921,7 @@ msgstr "%s: il file è l'archivio; non archiviato" msgid "%s: File removed before we read it" msgstr "%s: file rimosso prima di poterlo leggere" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "directory non archiviata" @@ -994,7 +1007,7 @@ msgstr "%s: tipo di file \"%c\" sconosciuto, estratto come file normale" #: src/extract.c:1181 #, c-format msgid "Current %s is newer or same age" -msgstr "Il file \"%s\" corrente è più recente o ha la stessa data" +msgstr "Il file %s corrente è più recente o ha la stessa data" #: src/extract.c:1227 #, c-format @@ -1011,123 +1024,123 @@ msgstr "Impossibile rinominare %s in %s" msgid "Error is not recoverable: exiting now" msgstr "Errore irrimediabile: uscita immediata" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: directory rinominata da %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: directory rinominata" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: la directory è nuova" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Orario non valido" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Orario di modifica non valido (secondi)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Orario di modifica non valido (nanosecondi)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Numero di device non valido" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Numero dell'inode non valido" # (ndt) oppure rendere snapshot come istantanea? -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Campo troppo lungo nel leggere il file di snapshot" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Errore di lettura nel file di snapshot" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "EOF inatteso nel file di snapshot" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Valore del campo inatteso nel file di snapshot" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Record finale mancante" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Formato file incrementale errato" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Versione formato incrementale non supportata: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir malformata: atteso \"%c\", ma trovato %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir malformata: \"X\" duplicata" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir malformata: nessun nome in \"R\"" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir malformata: \"T\" non preceduta da \"R\"" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir malformata: nessun nome in \"T\"" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir malformata: atteso \"%c\", ma trovata la fine dei dati" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir malformata: \"X\" mai usata" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Impossibile creare la directory temporanea usando il modello %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: eliminazione directory non eseguita: impossibile fare stat" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: la directory si trova su un altro device: non eliminata" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: eliminazione di %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: impossibile rimuoverlo" @@ -1354,87 +1367,87 @@ msgstr "" " nil, existing Numerati se esistono backup numerati, altrimenti semplici\n" " never, simple Esegue sempre backup semplici\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Modi operativi principali:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "Elenca i contenuti dell'archivio" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "Estrae file da un archivio" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "Crea un nuovo archivio" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "Trova differenze tra l'archivio e il file system" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "Accoda i file alla fine di un archivio" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "Accoda solo i file più recenti della copia nell'archivio" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "Aggiunge il contenuto di un altro archivio" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "Elimina dall'archivio (non su nastri magnetici)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "Verifica l'etichetta di volume dell'archivio ed esce" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Modificatori delle operazioni:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "Gestisce efficientemente i file sparsi" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" # (ndt) hmmm... formato sparso... -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "Imposta la versione da usare per il formato sparso (implica --sparse)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "gestisce i vecchi backup incrementali GNU" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FILE" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "Gestisce il nuovo formato di backup incrementali GNU" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "Non esce con non-zero quando ci sono file non leggibili" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMERO" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1447,119 +1460,119 @@ msgstr "" "sulla riga di comando o attraverso l'opzione -T; il valore predefinito di " "NUMERO è 1" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "L'archivio è posizionabile" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "Non controlla i numeri del device quando crea archivi incrementali" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" "Controlla i numeri del device quando crea archivi incrementali (predefinito)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Controlli di sovrascrittura:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "Tenta di verificare l'archivio dopo averlo scritto" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "Rimuove i file dopo averli aggiunti all'archivio" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "Durante l'estrazione non sovrascrive i file esistenti" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "Non sostituisce i file esistenti più recenti delle copie nell'archivio" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "Sovrascrive i file esistenti durante l'estrazione" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "Rimuove ogni file prima di estrarre su di esso" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "Svuota le directory prima di estrarle" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "Preserva i metadati delle directory esistenti" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "Sovrascrive i metadati delle directory esistenti durante l'estrazione " "(predefinito)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Selezione stream di output:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "Estrae i file sullo standard output" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMANDO" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "Invia in pipe i file estratti a un altro programma" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "Ignora il codice di uscita dei figli" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "Considera i codici di uscita non-zero come un errore" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Gestione degli attributi dei file:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "Forza NOME come proprietario per i file aggiunti" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "Forza NOME come gruppo per i file aggiunti" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATA-O-FILE" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "Imposta mtime per i file aggiunti da DATA-O-FILE" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "CAMBI" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "Forza il modo CAMBI (simbolico) per i file aggiunti" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METODO" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1569,29 +1582,29 @@ msgstr "" "dopo la lettura (METODO=\"replace\"; predefinito) o impostando l'orario " "all'inizio (METODO=\"system\")" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "Non estrae l'orario di ultima modifica del file" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "Cerca di estrarre i file con lo stesso proprietario" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "Estrae i file come l'utente attuale" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "Usa sempre i numeri per i nomi di utente/gruppo" -#: src/tar.c:491 +#: src/tar.c:490 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:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1599,15 +1612,15 @@ msgstr "" "Applica la umask dell'utente nell'estrarre i permessi dall'archivio " "(predefinito per gli utenti normali)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "Ordina i nomi da estrarre come nell'archivio" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "Come -p e -s assieme" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1615,139 +1628,139 @@ msgstr "" "Ritarda l'impostazione dei tempi di modifica e dei permessi delle directory " "estratte al termine dell'estrazione" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "Annulla l'effetto dell'opzione --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Selezione e cambio del device:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIVIO" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "Usa come archivio il file o il dispositivo ARCHIVIO" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "L'archivio è locale anche se contiene \":\"" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "Usa il COMANDO rmt indicato invece di rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "Usa il COMANDO remoto invece di rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "Indica drive e densità" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "Crea, elenca, estrae archivi multi-volume" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Cambia il nastro dopo avere scritto NUMERO × 1024 byte" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "Esegue lo script alla fine di ogni nastro (implica -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "Usa/aggiorna il numero del volume nel FILE" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" -msgstr "Blocchi dei dispositivi:" +msgstr "Blocchi del device:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOCCHI" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "Usa record di BLOCCHI × 512 byte" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMERO di byte per record, multiplo di 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Ignora i blocchi a zero nell'archivio (significa EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "Rifà i blocchi durante la lettura (per le pipe di 4.2BSD)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Selezione formato di archiviazione:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMATO" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "Crea archivi nel formato indicato" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMATO è uno dei seguenti:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "Vecchio formato di tar V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "Formato GNU di tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "Formato GNU di tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Formato POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Formato POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "Come pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "Come --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "Come --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "PAROLA_CHIAVE[[:]=VALORE][,PAROLA_CHIAVE[[:]=VALORE], ...]" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "Controlla le parole chiavi di pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TESTO" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1755,100 +1768,105 @@ msgstr "" "Crea l'archivio con TESTO come nome di volume; durante l'elencazione o " "l'estrazione, usa TESTO come modello di glob per ogni volume" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Opzioni di compressione:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" "Usa il suffisso dell'archivio per determinare il programma di compressione" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" +msgid "do not use archive suffix to determine the compression program" msgstr "" -"Usa il suffisso dell'archivio per determinare il programma di compressione" +"Non usa il suffisso dell'archivio per determinare il programma di " +"compressione" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "Filtra l'archivio attraverso bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "Filtra l'archivio attraverso gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "Filtra l'archivio attraverso compress" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "Filtra l'archivio attraverso lzma" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "Filtra l'archivio attraverso gzip" +msgstr "Filtra l'archivio attraverso lzop" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "Filtra l'archivio attraverso gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "Filtra attraverso PROG (deve accettare -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Selezione dei file locali:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "Aggiunge FILE all'archivio (utile se il nome inizia con un trattino)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "DIR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "Passa alla directory DIR" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "Prende i nomi da estrarre o creare dal file FILE" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T legge nomi terminati da NULL, disabilita -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "Disabilita l'effetto dell'opzione --null precedente" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" "Toglie i caratteri di citazione dai nomi dei file letti con -T (predefinito)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "Non toglie i caratteri di citazione dai nomi dei file letti con -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "MODELLO" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "Esclude i file i cui nomi corrispondono a MODELLO" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "Esclude i modelli elencati in FILE" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1856,93 +1874,93 @@ msgstr "" "Esclude i contenuti delle directory contenenti CACHEDIR.TAG, a parte il " "file .TAG stesso" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "Esclude tutto quanto all'interno di directory contenenti CACHEDIR.TAG" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Esclude le directory contenenti CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "Esclude i contenuti delle directory contenenti FILE, a parte FILE stesso " -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "Esclude tutto quanto all'interno di directory contenenti FILE" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "Esclude le directory contenenti FILE" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "Esclude le directory dei sistemi di controllo della versione" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "Non entra automaticamente nelle directory" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "Resta nel file system locale durante la creazione dell'archivio" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "Entra ricorsivamente nelle directory (predefinito)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "Non rimuove le \"/\" iniziali dai nomi dei file" # (ndt) hmmm... non molto chiara... -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "NOME" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "Inizia dal membro NOME nell'archivio" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "Archivia solo i file più recenti di DATA-O-FILE" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATA" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "Confronta data e ora solo quando il contenuto è cambiato" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "CONTROLLO" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "Esegue un backup prima di rimuovere, usando il CONTROLLO di versione" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "STRINGA" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1950,94 +1968,94 @@ msgstr "" "Esegue un backup prima di rimuovere, sovrascrivendo il suffisso \"~\" a meno " "che non sia sovrascritto dalla variabile d'ambiente SIMPLE_BACKUP_SUFFIX" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Trasformazioni dei nomi di file:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "Toglie NUMERO componenti iniziali dai nomi dei file durante l'estrazione" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "ESPRESSIONE" -#: src/tar.c:688 +#: src/tar.c:689 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:694 +#: src/tar.c:695 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:697 +#: src/tar.c:698 msgid "ignore case" msgstr "Non fa differenza tra maiuscole e minuscole" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "I modelli corrispondono all'inizio del nome del file" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" "I modelli corrispondono dopo ogni \"/\" (predefinito per le esclusioni)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "Considera diverse le maiuscole e le minuscole (predefinito)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "Utilizza i metacaratteri (predefinito per le esclusioni)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "Corrispondenza letterale della stringa" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "I metacaratteri non corrispondono \"/\"" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "I metacaratteri corrispondono \"/\" (predefinito per le esclusioni)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Output informativo:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "Elenca prolissamente i file elaborati" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Visualizza un messaggio di avanzamento ogni NUMERO-esimo record (predefinito " "10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "AZIONE" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "Esegue l'azione a ogni punto di controllo" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "Stampa un messaggio se non tutti i collegamenti sono archiviati" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SEGNALE" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2049,27 +2067,27 @@ msgstr "" "sono: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 e SIGUSR2; sono accettati anche i " "nomi senza il prefisso SIG" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "Stampa le date di modifica dei file in formato UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "Invia l'output prolisso al FILE" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "Mostra il numero di blocco nell'archivio con ogni messaggio" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "Chiede conferma per ogni azione" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "Mostra le impostazioni predefinite di tar" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2077,33 +2095,33 @@ msgstr "" "All'elencazione o all'estrazione, elenca ogni directory che non corrisponde " "al criterio di ricerca" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "Mostra il nome del file o dell'archivio dopo la trasformazione" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STILE" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "Caratteri di citazione aggiuntivi da STRINGA" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "Disabilita la citazione per i caratteri dalla STRINGA" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Opzioni di compatibilità:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2111,56 +2129,56 @@ msgstr "" "Alla creazione, uguale a --old-archive; all'estrazione, uguale a --no-same-" "owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Altre opzioni:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "Disabilita l'uso di alcune opzioni potenzialmente dannose" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Non è possibile indicare più di un'opzione \"-Acdtrux\"" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Conflitto tra le opzioni di compressione" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Nome del segnale sconosciuto: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "File campione della data non trovato" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Sostituzione di %s al posto del formato di data sconosciuto %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Opzione %s: la data \"%s\" viene considerata come %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: elenco file già letto" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: il nome di file letto contiene un carattere NULL" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Argomenti validi per le opzioni --quoting-style sono:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2168,166 +2186,164 @@ msgstr "" "\n" "Questo tar ha le seguenti impostazioni predefinite:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Fattore del blocco non valido" -#: src/tar.c:1369 -msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" -msgstr "" -"Attenzione: l'opzione -I non è supportata; forse si intendeva usare -j o -T?" - -#: src/tar.c:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Lunghezza del nastro non valida" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Più di una data di soglia" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Valore versione sparsa non valido" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve=\"system\" non è supportato su questa piattaforma" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "Il valore --checkpoint non è un intero" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: gruppo non valido" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Modo fornito sull'opzione non valido" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Numero non valido" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Proprietario non valido" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"L'opzione --preserve è deprecata, usare --preserve-permissions --preserve-" +"order" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Dimensione del record non valida" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Numero di elementi non valido" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Consentita solo un'opzione --to-command" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Argomento densità non corretto: \"%s\"" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Densità sconosciuta: \"%c\"" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Le opzioni \"-[0-7][lmh]\" non sono gestite da questo tar" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FILE]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "La vecchia opzione \"%c\" richiede un argomento." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence non ha senso senza un elenco di file" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence non può essere usata nel modo di operazioni richiesto" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Archivi multipli richiedono l'opzione \"-M\"" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Impossibile combinare --listed-incremental e --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: l'etichetta di volume è troppo lunga (il limite è %lu byte)" msgstr[1] "%s: l'etichetta di volume è troppo lunga (il limite sono %lu byte)" -#: src/tar.c:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Impossibile verificare archivi multi-volume" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Impossibile verificare archivi compressi" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Impossibile usare archivi multi-volume compressi" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Impossibile concatenare archivi compressi" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option può essere usata solo su archivi POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" +"La lunghezza del volume non può essere minore della dimensione del record" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "--preserve-order non è compatibile con --listed-incremental" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Rifiuto totale di creare un archivio vuoto" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Le opzioni \"-Aru\" sono incompatibili con \"-f -\"" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "È necessario specificare una delle opzioni \"-Acdtrux\"" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Uscita con stato di fallimento in base agli errori precedenti" #: src/update.c:86 #, c-format @@ -2458,7 +2474,7 @@ msgid "" "genfile manipulates data files for GNU paxutils test suite.\n" "OPTIONS are:\n" msgstr "" -"genfile manipola i file per la suite GNU paxutils.\n" +"genfile manipola i file per la suite di test GNU paxutils.\n" "Le opzioni sono:\n" #: tests/genfile.c:126 @@ -2488,7 +2504,7 @@ 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\"" +"Riempie il file con il MODELLO fornito. MODELLO è \"default\" o \"zeros\"" #: tests/genfile.c:139 msgid "Size of a block for sparse file" @@ -2598,12 +2614,12 @@ msgstr "stat(%s) non riuscita" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "lunghezza file richiesta %lu, effettiva %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "il file creato non è sparso" # (ndt) ? #: tests/genfile.c:353 @@ -2698,5 +2714,7 @@ msgstr "--stat richiede i nomi dei file" msgid "too many arguments" msgstr "troppi argomenti" -#~ msgid "Error exit delayed from previous errors" -#~ msgstr "Uscita per errore ritardata dall'errore precedente" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "" +#~ "Attenzione: l'opzione -I non è supportata; forse si intendeva usare -j o -" +#~ "T?" diff --git a/po/ja.gmo b/po/ja.gmo index 9a8b215..c8220ce 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index 9a523c4..f987c40 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,5 +1,6 @@ -# Japanese messages for GNU tar 1.19.90 +# Japanese messages for GNU tar 1.21 # Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. +# This file is distributed under the same license as the tar package. # Masahito Yamaga , 2008. # derived from the version by # Daisuke Yamashita , 1999-2001. @@ -7,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.19.90\n" +"Project-Id-Version: GNU tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-02-09 09:10+0900\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2008-12-27 20:22+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -83,7 +84,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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Þ¤Ç.\n" @@ -92,15 +93,15 @@ msgstr " msgid "Unknown system error" msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "¤³¤Î¥Ø¥ë¥×°ìÍ÷¤òɽ¼¨" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "û¤¤»ÈÍÑË¡¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NAME" @@ -113,11 +114,11 @@ msgstr " msgid "SECS" msgstr "SECS" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "SECS ÉÃÄä»ß (ɸ½à 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "¥×¥í¥°¥é¥à¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨" @@ -314,11 +315,11 @@ msgstr " #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -370,10 +371,11 @@ msgid "(C)" msgstr "(C)" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -497,6 +499,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s ¾.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <%s> ¤Þ¤Ç.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "ÆþÎÏʸ»úÎó¤¬Ä¹²á¤®¤Þ¤¹" @@ -533,15 +557,6 @@ msgstr "" " --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎÏ.\n" " --help ¤³¤Î¥Ø¥ë¥×¤ò½ÐÎÏ.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"¥Ð¥°¥ì¥Ý¡¼¥È¤Ï <%s> ¤Þ¤Ç.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "¸¡º÷¥ª¥Õ¥»¥Ã¥È¥¨¥é¡¼" @@ -566,103 +581,103 @@ msgstr " msgid "Garbage command" msgstr "ÉÔÍפʥ³¥Þ¥ó¥É" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Áí½ñ¤­½Ð¤·¥Ð¥¤¥È¿ô" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "ÁíÆɤ߹þ¤ß¥Ð¥¤¥È¿ô" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Áíºï½ü¥Ð¥¤¥È¿ô: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(¥Ñ¥¤¥×)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "record_size ¤¬Ìµ¸ú¤ÊÃͤǤ¹" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "¥¢¡¼¥«¥¤¥Ö̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "ɸ½àÆþ½ÐÎϤΥ¢¡¼¥«¥¤¥Ö¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï°µ½Ì¤µ¤ì¤Æ¤¤¤Þ¤¹. %s ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤Þ¤»¤ó" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "¥Æ¡¼¥×¤ÎÀèƬ¤Ç¤¹. ½èÍý¤òÃæ»ß¤·¤Þ¤¹" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤Þ¤¹. ½èÍý¤òÃæ»ß¤·¤Þ¤¹" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "µ­Ï¿¥µ¥¤¥º = %lu ¥Ö¥í¥Ã¥¯" msgstr[1] "µ­Ï¿¥µ¥¤¥º = %lu ¥Ö¥í¥Ã¥¯" -#: src/buffer.c:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ò¸å¤íÊý¸þ¤ËÌ᤻¤Þ¤»¤ó. -i ¤Ê¤·¤Ç¤ÏÆɤá¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó." -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ¤òµ­Ï¿¤Î¶­³¦¤Ç»ß¤á¤Þ¤»¤ó" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: ̵¸ú¤Ê¥Ü¥ê¥å¡¼¥àÈÖ¹æ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "¥Ü¥ê¥å¡¼¥àÈֹ椬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¤·¤Þ¤·¤¿" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "¥Ü¥ê¥å¡¼¥à #%d (%s) ¤ò½àÈ÷¤·¤Þ¤¹. ¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "¥æ¡¼¥¶¤¬±þÅú¤¹¤ë EOF ¤¬É¬ÍפȤʤê¤Þ¤¹" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "·Ù¹ð: ¥¢¡¼¥«¥¤¥Ö¤¬ÉÔ´°Á´¤Ç¤¹" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -674,67 +689,67 @@ msgstr "" " q tar ¤ò½ªÎ»\n" " y ¤Þ¤¿¤Ï²þ¹Ô Áàºî¤ò·Ñ³\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! ¥µ¥Ö¥·¥§¥ë¤òµ¯Æ°\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? ¤³¤Î¥ê¥¹¥È¤òɽ¼¨\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "¿·¤·¤¤¥Ü¥ê¥å¡¼¥à¤¬¤¢¤ê¤Þ¤»¤ó. ½ªÎ»¤·¤Þ¤¹.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "¥Õ¥¡¥¤¥ë̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó. ¤â¤¦°ìÅÙ.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "ÉÔÀµ¤ÊÆþÎÏ. ? ¤Ç¥Ø¥ë¥×¤òɽ¼¨\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "%s ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s ¤Ï¤³¤Î¥Ü¥ê¥å¡¼¥à¾å¤Ç¤ª¤½¤é¤¯Ï¢Â³¤·¤Æ¤¤¤Þ¤¹: ¥Ø¥Ã¥À¤Ï¾Êά¤µ¤ì¤¿Ì¾Á°¤ò´Þ¤ó¤Ç" "¤¤¤Þ¤¹" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s ¤Ï¤³¤Î¥Ü¥ê¥å¡¼¥à¾å¤ÇϢ³¤·¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s ¤ÏÉÔÀµ¤Ê¥µ¥¤¥º¤Ç¤¹ (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "¤³¤Î¥Ü¥ê¥å¡¼¥à¤ÏϢ³¤·¤Æ¤¤¤Þ¤»¤ó" +msgstr "¤³¤Î¥Ü¥ê¥å¡¼¥à¤ÏϢ³¤·¤Æ¤¤¤Þ¤»¤ó (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï %s ¤Ë°ìÃפ¹¤ë¥é¥Ù¥ë¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "¥Ü¥ê¥å¡¼¥à %s ¤Ï %s ¤Ë°ìÃפ·¤Þ¤»¤ó" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -742,10 +757,9 @@ msgstr "" "%s: ¥Õ¥¡¥¤¥ë̾¤¬Ä¹²á¤®¤Æ GNU ¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À¤ËÊݸ¤Ç¤­¤Ê¤¤¤Î¤ÇÀÚ¤ê¼Î¤Æ" "¤Þ¤¹" -#: src/buffer.c:1619 -#, fuzzy +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek ¤òµ­Ï¿¤Î¶­³¦¤Ç»ß¤á¤Þ¤»¤ó" +msgstr "½ñ¤­¹þ¤ß¤¬¥Ö¥í¥Ã¥¯¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó" #: src/compare.c:96 #, c-format @@ -758,7 +772,7 @@ msgstr[1] "%lu msgid "Contents differ" msgstr "ÆâÍƤ¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Ëͽ´ü¤»¤Ì EOF ¤¬¤¢¤ê¤Þ¤¹" @@ -876,7 +890,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "ÆâÍƤò¥À¥ó¥×¤·¤Þ¤»¤ó" @@ -905,7 +919,7 @@ msgstr "%s: msgid "%s: File removed before we read it" msgstr "%s: Æɤ߹þ¤ß°ÊÁ°¤Ëºï½ü¤µ¤ì¤Þ¤·¤¿" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¥À¥ó¥×¤·¤Þ¤»¤ó" @@ -999,122 +1013,122 @@ msgstr "%s msgid "Error is not recoverable: exiting now" msgstr "¥¨¥é¡¼¤ò²óÉü¤Ç¤­¤Þ¤»¤ó: ľ¤Á¤Ë½ªÎ»¤·¤Þ¤¹" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬ %s ¤«¤éÊѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï¿·¤·¤¯ºî¤é¤ì¤Þ¤·¤¿" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "̵¸ú¤Ê¥¿¥¤¥à¥¹¥¿¥ó¥×" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (ÉÃ)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (¥Ê¥ÎÉÃ)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "̵¸ú¤Ê¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤Ç¤¹" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "̵¸ú¤Ê inode ÈÖ¹æ" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ßÃæ¤Ë¥Õ¥£¡¼¥ë¥É¤¬Ä¹²á¤®¤Þ¤¹" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ËÆɤ߹þ¤ß¥¨¥é¡¼" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì EOF" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì¥Õ¥£¡¼¥ë¥ÉÃÍ" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "½ªÃ¼µ­Ï¿¤Ê¤·" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "ÉÔÀµ¤ÊÁýʬ¥Õ¥¡¥¤¥ë·Á¼°" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "̤¼ÂÁõ¤ÎÁýʬ·Á¼°¥Ð¡¼¥¸¥ç¥ó: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬½ÅÊ£" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'R' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤¬ 'R' ¤ÎÁ°¤Ë¤Ê¤¤" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë¥Ç¡¼¥¿¤Î½ªÃ¼" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬Ì¤»ÈÍÑ" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "¥Æ¥ó¥×¥ì¡¼¥È %s ¤ò»È¤Ã¤Æ°ì¼¡¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ì¤Þ¤»¤ó" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤Þ¤»¤ó: ¾õÂÖ¤¬Ê¬¤«¤ê¤Þ¤»¤ó" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°Û¤Ê¤ë¥Ç¥Ð¥¤¥¹¾å¤Ë¤¢¤ë¤Î¤Ç¾Ãµî¤·¤Þ¤»¤ó" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ¤òºï½ü\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: ºï½ü¤Ç¤­¤Þ¤»¤ó" @@ -1332,86 +1346,86 @@ msgstr "" " ¤½¤¦¤Ç¤Ê¤±¤ì¤Ðñ¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë\n" " never, simple ¾ï¤Ëñ½ã¤Ê¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "¼çÁàºî¥â¡¼¥É:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎÆâÍƤò°ìÍ÷ɽ¼¨" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤«¤é¥Õ¥¡¥¤¥ë¤òÃê½Ð" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "¿·¤·¤¤¥¢¡¼¥«¥¤¥Ö¤òºîÀ®" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "¥¢¡¼¥«¥¤¥Ö¤È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤Î°ã¤¤¤ò¸«ÉÕ¤±¤ë" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎËöÈø¤Ë¥Õ¥¡¥¤¥ë¤òÄɲÃ" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î¤ß¤òÄɲÃ" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë tar ¥Õ¥¡¥¤¥ë¤òÄɲÃ" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "¥¢¡¼¥«¥¤¥Ö¤«¤éºï½ü (¼§µ¤¥Æ¡¼¥×¾å¤Ç¤Ï¥À¥á!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "¥¢¡¼¥«¥¤¥Ö¤Î¥Ü¥ê¥å¡¼¥à¥é¥Ù¥ë¤ò¥Æ¥¹¥È¤·¤Æ½ªÎ»" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Áàºî¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ëÉղõ¡Ç½:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "¤Þ¤Ð¤é¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ò¸ú²ÌŪ¤Ë½èÍý" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "¤Þ¤Ð¤é (sparse) ·Á¼°¤Î¥Ð¡¼¥¸¥ç¥ó¤òÀßÄê (--sparse ¤Î°ÕÌ£¤ò´Þ¤à)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "¸Å¤¤ GNU ·Á¼°¤Î¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò½èÍý" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FILE" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "¿·¤·¤¤ GNU ·Á¼°¤Î¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò½èÍý" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "Æɤ߹þ¤á¤Ê¤¤¥Õ¥¡¥¤¥ë¾å¤ËÈó¥¼¥í¤Î¾õÂ֤Ǹºß¤·¤Þ¤»¤ó" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMBER" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1423,116 +1437,116 @@ msgstr "" "¥Õ¥¡¥¤¥ë°ìÍ÷¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤« -T ¥ª¥×¥·¥ç¥ó·Ðͳ¤Î¤É¤Á¤é¤«¤Ç»ØÄꤵ¤ì¤¿¾ì¹ç¤Î" "¤ßÍ­¸ú. NUMBER ¤Ïɸ½à¤Ç 1." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï¸¡º÷²Äǽ" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥¢¡¼¥«¥¤¥ÖºîÀ®»þ¤Ë¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" -msgstr "" +msgstr "¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥¢¡¼¥«¥¤¥ÖºîÀ®»þ¤Ë¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤ò¥Á¥§¥Ã¥¯¤¹¤ë (ɸ½à)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "À©¸æ¤ò¾å½ñ¤­:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "¥¢¡¼¥«¥¤¥Ö¤ò½ñ¤­½Ð¤·¤¿¸å¤Ë¸¡¾Ú" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤Ë²Ã¤¨¤¿¸å¤Çºï½ü" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "¥¢¡¼¥«¥¤¥Ö¥³¥Ô¡¼¤è¤ê¿·¤·¤¤´û¸¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "³Æ¡¹¤Î¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æ¾å½ñ¤­¤¹¤ëÁ°¤Ëºï½ü" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¼è¤ê½Ð¤¹Á°¤Ë³¬Áؤò¶õ¤Ë" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "´û¸¥Ç¥£¥ì¥¯¥È¥ê¤Î¥á¥¿¥Ç¡¼¥¿¤òÊݸ" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¥Ç¥£¥ì¥¯¥È¥ê¤Î¥á¥¿¥Ç¡¼¥¿¤ò¾å½ñ¤­ (ɸ½à)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "½ÐÎÏ¥¹¥È¥ê¡¼¥à¤òÁªÂò" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æɸ½à½ÐÎϤ˽ÐÎÏ" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMMAND" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤ÆÊÌ¤Î¥×¥í¥°¥é¥à¤Ë½ÐÎÏ" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "»Ò¥×¥í¥»¥¹¤Î½ªÎ»¥³¡¼¥É¤ò̵»ë" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "»Ò¥×¥í¥»¥¹¤ÎÈó¥¼¥í½ªÎ»¥³¡¼¥É¤ò¥¨¥é¡¼¤È¤·¤Æ½èÍý" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "¥Õ¥¡¥¤¥ë°À­¤Î½èÍý" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤ò NAME ¤ËÊѹ¹" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î¥°¥ë¡¼¥×¤ò NAME ¤ËÊѹ¹" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATE-OR-FILE" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "DATE-OR-FILE ¤«¤éÄɲåե¡¥¤¥ë¤Î mtime ¤òÀßÄê" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "CHANGES" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î (¥·¥ó¥Ü¥ê¥Ã¥¯) ¥â¡¼¥É¤ò CHANGES ¤ËÊѹ¹" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METHOD" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1541,181 +1555,181 @@ msgstr "" "ºÇ½ª¥¢¥¯¥»¥¹»þ¹ï¤ò, Æɤ߹þ¤ß¸å¤ËÉü¸µ¤¹¤ë (METHOD='replace'; ɸ½à) ¤«ºÇ½é¤ËÀß" "Äꤷ¤Ê¤¤ (METHOD='system') ¤«¤Î¤É¤Á¤é¤«¤ÎÊýË¡¤Ç¥À¥ó¥×¥Õ¥¡¥¤¥ë¾å¤Ç°Ý»ý" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "¥Õ¥¡¥¤¥ë¤Î¹¹¿·»þ¹ï¤ò¼è¤ê½Ð¤µ¤Ê¤¤" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "Ʊ¤¸½êÍ­¼Ô¤Î¤Þ¤Þ¤Ç¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æ¤ß¤ë" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "¤¢¤Ê¤¿¼«¿È¤Î¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼è¤ê½Ð¤¹" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "¥æ¡¼¥¶Ì¾/¥°¥ë¡¼¥×̾¤È¤·¤Æ¾ï¤Ë¿ô»ú¤ò»È¤¦" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "¥Õ¥¡¥¤¥ë°À­¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÃê½Ð (superuser ¤Ç¤Ïɸ½à)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" "¥¢¡¼¥«¥¤¥Ö¤«¤é°À­¤òÃê½Ð¤¹¤ëºÝ¤Ë¥æ¡¼¥¶¤Î umask ¤òŬÍÑ (°ìÈ̥桼¥¶¤Ç¤Ïɸ½à)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤È¥Þ¥Ã¥Á¤µ¤»¤ë¤¿¤á¤Ë¼è¤ê½Ð¤¹Ì¾Á°¤òʤÓÂؤ¨" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "-p ¤È -s ¤ÎξÊý¤ò»ØÄꤷ¤¿¤â¤Î¤ÈƱ¤¸" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" "Ãê½Ð¤¬½ªÎ»¤¹¤ë¤Þ¤ÇÃê½Ð¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ÎºÇ½ª¹¹¿·»þ¹ï¤È°À­¤ÎÀßÄê¤òÃ٤餻¤ë" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore ¥ª¥×¥·¥ç¥ó¤Î¸ú²Ì¤ò¼è¤ê¾Ã¤·" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "¥Ç¥Ð¥¤¥¹¤ÎÁªÂò¤ÈÀÚÂØ:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥Ð¥¤¥¹ ARCHIVE ¤ò»ÈÍÑ" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ï¥³¥í¥ó¤ò´Þ¤ó¤Ç¤¤¤Æ¤â¥í¡¼¥«¥ë" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "»ØÄꤵ¤ì¤¿ rmt COMMAND ¤ò rmt ¤ÎÂå¤ï¤ê¤Ë»ÈÍÑ" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "rsh ¤ÎÂå¤ï¤ê¤Ë COMMAND ¤ò»ÈÍÑ" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "¥É¥é¥¤¥Ö¤ÈÌ©ÅÙ¤ò»ØÄê" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®/°ìÍ÷/Ãê½Ð" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "NUMBER x 1024 ¥Ð¥¤¥È¤ò½ñ¤­½Ð¤·¤¿¸å¤Ç¥Æ¡¼¥×¤òÊѹ¹" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "³Æ¡¹¤Î¥Æ¡¼¥×¤ÎºÇ¸å¤Ç¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô (-M ɬ¿Ü)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "FILE Ãæ¤Î¥Ü¥ê¥å¡¼¥àÈÖ¹æ¤ò»ÈÍÑ/¹¹¿·" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "¥Ç¥Ð¥¤¥¹¥Ö¥í¥Ã¥­¥ó¥°:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOCKS" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "¥ì¥³¡¼¥É¤¢¤¿¤ê BLOCKS x 512 ¥Ð¥¤¥È" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "¥ì¥³¡¼¥É¤¢¤¿¤ê NUMBER ¥Ð¥¤¥È. 512 ¤ÎÇÜ¿ô" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Î¥¼¥í¥Ö¥í¥Ã¥¯ (¤Ä¤Þ¤ê EOF) ¤ò̵»ë" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "Æɤ߽Ф·¤¿¤è¤¦¤ËºÆ¥Ö¥í¥Ã¥¯ (4.2BSD ¥Ñ¥¤¥×ÍÑ)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "¥¢¡¼¥«¥¤¥Ö·Á¼°¤ÎÁªÂò" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "»ØÄꤵ¤ì¤¿·Á¼°¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMAT ¤Ï¼¡¤Î¤¦¤Á¤Î 1¤Ä:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "¸Å¤¤ V7 tar ·Á¼°" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU tar 1.12 °ÊÁ°¤Î·Á¼°" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x ·Á¼°" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) ·Á¼°" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) ·Á¼°" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "pax ¤ÈƱ¤¸" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "--format=v7 ¤ÈƱ¤¸" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "--format=posix ¤ÈƱ¤¸" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "keyword[[:]=value][,keyword[[:]=value]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "pax ¥­¡¼¥ï¡¼¥É¤òÀ©¸æ" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1723,185 +1737,189 @@ msgstr "" "¥Ü¥ê¥å¡¼¥à̾ TEXT ¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®. °ìÍ÷/Ãê½Ð»þ¤Ë TEXT ¤ò¥Ü¥ê¥å¡¼¥à̾¤ËÂФ¹" "¤ëÃê½Ð¥Ñ¥¿¡¼¥ó¤Ë»ÈÍÑ" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "°µ½Ì¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" -msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍÑ" +msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍѤ¹¤ë" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" -msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍÑ" +msgid "do not use archive suffix to determine the compression program" +msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍѤ·¤Ê¤¤" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "bzip2 ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "gzip ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "compress ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "lzma ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "gzip ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" +msgstr "lzop ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "gzip ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "PROG ·Ðͳ¤Ç¥Õ¥£¥ë¥¿ (-d ¤ò¼õ¤±ÉÕ¤±¤ëɬÍפ¢¤ê)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ëÁªÂò:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "»ØÄꤵ¤ì¤¿ FILE ¤ò¥¢¡¼¥«¥¤¥Ö¤ËÄɲà (¥À¥Ã¥·¥å ' ¤Ç»Ï¤Þ¤ë¥Õ¥¡¥¤¥ë̾¤Î¾ì¹ç¤ËÊØ" "Íø)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "DIR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ø°ÜÆ°" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "Ãê½Ð¤Þ¤¿¤ÏºîÀ®¤¹¤ë̾Á°¤ò¥Õ¥¡¥¤¥ë FILE ¤«¤é¼èÆÀ" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" -msgstr "-T ¤¬ null ¤Ç½ª¤ï¤ë̾Á°¤òÆɤ߹þ¤ß, -C ¤ò̵¸ú¤Ë" +msgstr "-T ¤¬ null ¤Ç½ª¤ï¤ë̾Á°¤òÆɤ߹þ¤ß, -C ¤ò̵¸ú²½" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "Á°¤Î --null ¥ª¥×¥·¥ç¥ó¤Î¸ú²Ì¤ò̵¸ú²½" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "-T ¤ÇÆɤ߹þ¤ó¤À¥Õ¥¡¥¤¥ë̾¤ò°úÍѽªÎ»¤¹¤ë (ɸ½à)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "-T ¤ÇÆɤ߹þ¤ó¤¿¥Õ¥¡¥¤¥ë̾¤ò°úÍѽªÎ»¤·¤Ê¤¤" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "PATTERN ¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤ò½ü³°" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "FILE ¤ËÎóµó¤µ¤ì¤¿¥Ñ¥¿¡¼¥ó¤ò½ü³°" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "¥¿¥°¥Õ¥¡¥¤¥ë¼«¿È¤ò½ü¤¯ CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤò½ü³°" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¤Æ¤ò½ü³°" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "FILE ¼«¿È¤ò½ü¤¯ FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤò½ü³°" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¤Æ¤ò½ü³°" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "¥Ð¡¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¼«Æ°Åª¤Ë²¼¤Ã¤Æ¤¤¤«¤Ê¤¤" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "¥¢¡¼¥«¥¤¥ÖºîÀ®»þ¤Ë¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¸ÂÄê" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò½ç·«¤ê¤Ë²¼¤Ã¤Æ¤¤¤¯ (default)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "¥Õ¥¡¥¤¥ë̾¤«¤éÀèƬ¤Î `/' ¤ò¼è¤ê½ü¤«¤Ê¤¤" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¤¿¤É¤ë; ¤½¤ì¤é¤¬»Ø¤¹¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤·¤Æ¥À¥ó¥×" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "¥Ï¡¼¥É¥ê¥ó¥¯¤ò¤¿¤É¤ë; ¤½¤ì¤é¤¬»Ø¤¹¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤·¤Æ¥À¥ó¥×" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "MEMBER-NAME" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Î¥á¥ó¥Ð¡¼ MEMBER-NAME ¤Ç³«»Ï" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "DATE-OR-FILE ¤è¤ë¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î¤ß¤ò³ÊǼ" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATE" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿»þ¤À¤±ÆüÉÕ¤ª¤è¤Ó»þ¹ï¤òÈæ³Ó" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "ºï½üÁ°¤Ë¥Ð¡¼¥¸¥ç¥ó´ÉÍý¤ò CONTROL ¤Ë¤·¤Æ¥Ð¥Ã¥¯¥¢¥Ã¥×" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "STRING" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1909,87 +1927,87 @@ msgstr "" "ºï½üÁ°¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×, Ä̾ï¤ÎÀÜÈø¼­ (´Ä¶­ÊÑ¿ô SIMPLE_BACKUP_SUFFIX ¤¬Ì¤ÀßÄê¤Ê" "¤é '~') ¤ò¾å½ñ¤­" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "¥Õ¥¡¥¤¥ë̾ÊÑ´¹:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "Ãê½Ð»þ¤Ë¥Õ¥¡¥¤¥ë̾¤«¤éÀèƬ¤Î NUMER ¸Ä¤Î¥³¥ó¥Ý¥Í¥ó¥È¤ò½üµî" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊÑ´¹¤Ë sed ¤ÎÃÖ´¹ EXPRESSION ¤ò»ÈÍÑ" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "¥Õ¥¡¥¤¥ë̾°ìÃ×¥ª¥×¥·¥ç¥ó (½ü³°/Êñ´Þ¤Îξ¥Ñ¥¿¡¼¥ó¤ËºîÍÑ):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "Âçʸ»ú¾®Ê¸»ú¤ò̵»ë" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤È¥Ñ¥¿¡¼¥ó¤¬°ìÃ×" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "Ǥ°Õ¤Î `/' °Ê¹ß¤Ë¥Ñ¥¿¡¼¥ó¤¬°ìÃ× (ɸ½à¤Ç½ü³°)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "Âçʸ»ú¾®Ê¸»ú¤ò¹Íθ¤·¤Æ°ìÃ× (ɸ½à)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ÈÍÑ (ɸ½à¤Ç½ü³°)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "Ãà¸ìŪʸ»úÎó°ìÃ×" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ `/' ¤Ë°ìÃפ·¤Ê¤¤" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ `/' ¤Ë°ìÃ× (ɸ½à¤Ç½ü³°)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "¾ðÊó:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "½èÍý¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤ò¾éŤËɽ¼¨" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "NUMBER (ɸ½à 10) ÈÖÌܤε­Ï¿¤´¤È¤Ë¿ÊĽ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "³Æ¸¡Ìä¤Ç ACTION ¤ò¼Â¹Ô" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "Á´¤Æ¤Î¥ê¥ó¥¯¤¬¥À¥ó¥×¤µ¤ì¤Ê¤¤¾ì¹ç¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2000,112 +2018,112 @@ msgstr "" "»þ¤ËÁí¥Ð¥¤¥È¿ô¤òɽ¼¨. µö²Ä¤µ¤ì¤¿ SIGNAL ¤Ï: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 " "¤ª¤è¤Ó SIGUSR2. SIG ÀÜƬ¼­¤¬¤Ê¤¤Ì¾Á°¤Ç¤â²Ä" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "¥Õ¥¡¥¤¥ë¤Î¹¹¿·ÆüÉÕ¤ò UTC ¤Çɽ¼¨" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "¾éĹ½ÐÎϤò FILE ¤ËÁ÷¿®" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥Ö¥í¥Ã¥¯¿ô¤ò³Æ¡¹¥á¥Ã¥»¡¼¥¸ÉÕ¤­¤Çɽ¼¨" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "Á´¤Æ¤ÎÆ°ºî¤ò³Îǧ" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "tar ¤Îµ¬ÄêÃͤòɽ¼¨" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "°ìÍ÷¤äÃê½Ð»þ¤Ë, ¸¡º÷´ð½à¤Ë°ìÃפ·¤Ê¤¤¥Ç¥£¥ì¥¯¥È¥ê¤ò³Æ¡¹°ìÍ÷ɽ¼¨" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "ÊÖ´Ô¸å¤Ë¥Õ¥¡¥¤¥ë̾¤Þ¤¿¤Ï¥¢¡¼¥«¥¤¥Ö̾¤òɽ¼¨" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "̾Á°°úÍÑ·Á¼°¤òÀßÄê. Í­¸ú¤Ê STYLE Ãͤϲ¼µ­»²¾È." -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "¹¹¤Ë STRING ¤«¤éʸ»ú¤ò°úÍÑ" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "STRING ¤«¤é¤Îʸ»ú°úÍѤò̵¸ú¤Ë" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "¸ß´¹¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "ºîÀ®»þ¤Ï --old-archive ¤ÈƱ¤¸. Ãê½Ð»þ¤Ï --no-same-owner ¤ÈƱ¤¸" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "¤½¤Î¾¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "ÀøºßŪ¤Ë³²¤Ë¤Ê¤ë¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤò̵¸ú¤Ë" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' ¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á 2¤Ä°Ê¾å»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó." -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "°µ½Ì¥ª¥×¥·¥ç¥ó¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "̤ÃΤΥ·¥°¥Ê¥ë̾: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "ÆüÉÕ¥µ¥ó¥×¥ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "̤ÃΤÎÆüÉÕ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î %2$s Âå¤ï¤ê¤Ë %1$s ¤È¤·¤Þ¤¹" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "¥ª¥×¥·¥ç¥ó %s: `%s' ¤ò %s ¤È¤·¤Æ°·¤¦" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: ¥Õ¥¡¥¤¥ë°ìÍ÷¤Ï´û¤ËÆɤ߹þ¤ßºÑ¤ß" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: Æɤ߹þ¤Þ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ë¥Ì¥ëʸ»ú" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style ¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ëÍ­¸ú¤Ê°ú¿ô¤Ï:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2113,165 +2131,163 @@ msgstr "" "\n" "¡Ö¤³¤Î¡×tar ¤Îµ¬ÄêÃÍ:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "̵¸ú¤Ê¥Ö¥í¥Ã¥­¥ó¥°°ø»Ò" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "̵¸ú¤Ê¥Æ¡¼¥×¤ÎŤµ" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "1¤Ä°Ê¾å¤ÎÉßµï¤È¤Ê¤ëÆüÉÕ" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "̵¸ú¤Ê¤Þ¤Ð¤é (sparse) ¥Ð¡¼¥¸¥ç¥óÃÍ" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ¤Ï¤³¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "--checkpoint ÃͤÏÀ°¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: ̵¸ú¤Ê¥°¥ë¡¼¥×" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥â¡¼¥É¤Ï̵¸ú¤Ç¤¹" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "̵¸ú¤Ê¿ô" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "̵¸ú¤Ê½êÍ­¼Ô" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"--preserve ¥ª¥×¥·¥ç¥ó¤ÏÇÑ»ßͽÄê¤Ê¤Î¤Ç, Âå¤ï¤ê¤Ë --preserve-permissions --" +"preserve-order ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "̵¸ú¤Êµ­Ï¿¥µ¥¤¥º" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "µ­Ï¿¥µ¥¤¥º¤Ï %d ¤ÎÇÜ¿ô¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "̵¸ú¤Ê¥¨¥ì¥á¥ó¥È¿ô" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "--to-command ¥ª¥×¥·¥ç¥ó¤Ï 1¤Ä¤À¤±µö²Ä" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "ÉÔÀµ·Á¼°¤ÎÌ©ÅÙ°ú¿ô: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "̤ÃΤÎÌ©ÅÙ: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "¥ª¥×¥·¥ç¥ó `-[0-7][lmh]' ¤Ï¡Ö¤³¤Î¡×tar ¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[¥Õ¥¡¥¤¥ë]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "¸Å¤¤¥ª¥×¥·¥ç¥ó `%c' ¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ¤Ï¥Õ¥¡¥¤¥ë°ìÍ÷¤¬¤Ê¤±¤ì¤Ð̵°ÕÌ£" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence ¤ÏÍ׵ᤵ¤ì¤¿Áàºî¥â¡¼¥É¤Ç¤Ï»È¤¨¤Þ¤»¤ó" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "ʬ³ä·¿¤Î¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ë¤Ï `-M' ¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental ¤È --newer ¤È¤ò·ë¹ç¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¥¢¡¼¥«¥¤¥Ö¤ò³Îǧ¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï³Îǧ¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¤Ë°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï»È¤¨¤Þ¤»¤ó" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤ÏÏ¢·ë¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "¥Ü¥ê¥å¡¼¥àĹ¤Ï¥ì¥³¡¼¥É¥µ¥¤¥º¤è¤ê¾®¤µ¤¯¤Æ¤Ï¤¤¤±¤Þ¤»¤ó" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "--preserve-order ¤Ï --listed-incremental ¤ÈξΩ¤·¤Þ¤»¤ó" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "¶õ¤Î¥¢¡¼¥«¥¤¥ÖºîÀ®¤Ï¤´ÍƼϴꤤ¤Þ¤¹" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "¥ª¥×¥·¥ç¥ó `-Aru' ¤È `-f -' ¤È¤ÏÁêÍƤì¤Þ¤»¤ó" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "¥ª¥×¥·¥ç¥ó `-Acdtrux' ¤Î¤¦¤Á¡¢¤¤¤º¤ì¤«¤ò»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Á°¤Î¥¨¥é¡¼¤Ë¤è¤ê¼ºÇÔ¥¹¥Æ¡¼¥¿¥¹¤Ç½ªÎ»¤·¤Þ¤¹" #: src/update.c:86 #, c-format @@ -2530,12 +2546,12 @@ msgstr "stat(%s) #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "Í׵ᤵ¤ì¤¿¥Õ¥¡¥¤¥ëĹ %lu, ¼ÂºÝ¤ÎÃÍ %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "ºîÀ®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï¥¹¥Ñ¡¼¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" #: tests/genfile.c:353 #, c-format @@ -2627,10 +2643,5 @@ msgstr "--stat 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 "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "·Ù¹ð: -I ¥ª¥×¥·¥ç¥ó¤Ï¼õ¤±Æþ¤ì¤é¤ì¤Þ¤»¤ó -- ¿ʬ -j ¤« -T ¤Ê¤Î¤Ç¤Ï?" diff --git a/po/ko.gmo b/po/ko.gmo index 7a0ed25..f6102f5 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index c1000ed..431f123 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -112,11 +112,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -322,11 +322,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "" @@ -383,7 +383,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -480,6 +480,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"·Î ¹ö±×¸¦ º¸°íÇØ ÁֽʽÿÀ.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -514,15 +536,6 @@ msgid "" " --help Output this help.\n" msgstr "" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"·Î ¹ö±×¸¦ º¸°íÇØ ÁֽʽÿÀ.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "" @@ -551,114 +564,114 @@ msgid "Garbage command" msgstr "¾µ¸ð¾ø´Â ¸í·É" # -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " # -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 #, fuzzy msgid "Total bytes read" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " # -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" # -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "¾ÆÄ«À̺ê À̸§ÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù" # -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Ç¥ÁØÀÔ/Ãâ·Â ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" # -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °»½ÅÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Å×ÀÌÇÁÀÇ ½ÃÀÛ ºÎºÐ¿¡¼­ Áö±Ý Á¾·áÇÔ" # -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Á¾·áÇÕ´Ï´Ù" -#: src/buffer.c:695 +#: src/buffer.c:697 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "·¹ÄÚµå Å©±â = %d ºí·°" msgstr[1] "·¹ÄÚµå Å©±â = %d ºí·°" -#: src/buffer.c:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "" # -#: src/buffer.c:929 +#: src/buffer.c:931 #, fuzzy, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "º¼·ý #%d(%s¸¦ À§ÇÑ)¸¦ ÁغñÇÏ°í ¸®ÅÏÀ» Ä¡¼¼¿ä: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "»ç¿ëÀÚÀÇ ÀÀ´äÀÌ ÇÊ¿äÇÑ °÷¿¡ EOF°¡ ÀÖÀ½" # -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "°æ°í: ¾ÆÄ«À̺갡 ºÒ¿ÏÀüÇÕ´Ï´Ù" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -670,77 +683,77 @@ msgstr "" " ! ¼­ºê¼ÐÀ» ½ÇÇàÇÕ´Ï´Ù\n" " ? ÀÌ ¸ñ·ÏÀ» ÀμâÇÕ´Ï´Ù\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" # -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "»õ º¼·ýÀÌ ¾Æ´Ô; Á¾·á.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "" # -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s´Â ÀÌ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s´Â ÀÌ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, fuzzy, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s´Â À߸øµÈ Å©±âÀÔ´Ï´Ù (%ld != %ld + %ld)" # -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "ÀÌ º¼·ýÀº ¼ø¼­¸¦ ¹þ¾î³µ½À´Ï´Ù" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, fuzzy, c-format msgid "Archive not labeled to match %s" msgstr "`%s'¿Í ÀÏÄ¡Çϵµ·Ï ¶óº§ÀÌ ºÙÁö ¾ÊÀº ¾ÆÄ«À̺ê" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "º¼·ý `%s'°¡ `%s'¿Í ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" # -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "ºí·° °æ°è°¡ ¾Æ´Ñ ºÎºÐ¿¡¼­ ¾ÆÄ«À̺ê %sÀÇ EOF °ËÃâ" @@ -759,7 +772,7 @@ msgid "Contents differ" msgstr "¸ðµå°¡ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "¾ÆÄ«À̺꿡 ¿¹±âÄ¡ ¾ÊÀº EOF" @@ -895,7 +908,7 @@ msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: ´Ù¸¥ ÆÄÀϽýºÅÛ »ó¿¡ ÀÖÀ½; ´ýÇÁµÇÁö ¾ÊÀ½" # -#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 #, fuzzy msgid "contents not dumped" msgstr " (ÄÚ¾î Ãâ·ÂµÊ)" @@ -929,7 +942,7 @@ msgstr "%s msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -1031,134 +1044,134 @@ msgid "Error is not recoverable: exiting now" msgstr "" # -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" # -#: src/incremen.c:457 +#: src/incremen.c:460 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" # -#: src/incremen.c:502 +#: src/incremen.c:505 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "%s´Â »õ µð·ºÅ丮ÀÔ´Ï´Ù" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" # -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 #, fuzzy msgid "Read error in snapshot file" msgstr "%s¿¡¼­ Àб⠿À·ù" # -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" # -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" # -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" # -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s¸¦ Áö¿ò\n" # -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "%s¸¦ Áö¿ï ¼ö ¾ø½À´Ï´Ù" @@ -1375,88 +1388,88 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" # -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "¾ÆÄ«À̺꿡 ¿¹±âÄ¡ ¾ÊÀº EOF" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1464,576 +1477,583 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" # -#: src/tar.c:433 +#: src/tar.c:432 #, fuzzy msgid "remove files after adding them to the archive" msgstr "¾ÆÄ«À̺꿡 ÀÖ´Â À̸§µé¿¡¼­ µå¶óÀ̺ê ÁöÁ¤¹®À» Á¦°ÅÇÔ" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" # -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" # -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Ç¥ÁØÀԷ¿¡ ´ëÇÑ ¾ÆÄ«À̺ê" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Çò°¥¸®´Â ¾ÐÃà ¿É¼Ç" -#: src/tar.c:596 +#: src/tar.c:595 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "¾ÐÃà ÇÁ·Î±×·¥¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" -msgstr "" +#: src/tar.c:597 +#, fuzzy +msgid "do not use archive suffix to determine the compression program" +msgstr "¾ÐÃà ÇÁ·Î±×·¥¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "" # -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s´Â ¾ÆÄ«À̺êÀÔ´Ï´Ù; ´ýÇÁµÇÁö ¾ÊÀ½" +# #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s´Â ¾ÆÄ«À̺êÀÔ´Ï´Ù; ´ýÇÁµÇÁö ¾ÊÀ½" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" # -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" # -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Àý´ë ¸µÅ©µé¿¡¼­ ¾Õ¿¡ ºÙÀº `/'¸¦ Á¦°ÅÇÔ" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "º¼·ý `%s'°¡ `%s'¿Í ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2041,231 +2061,227 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" # -#: src/tar.c:740 +#: src/tar.c:741 #, fuzzy msgid "ask for confirmation for every action" msgstr "»ç¿ëÀÚÀÇ È®ÀÎÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' ¿É¼Ç Áß Çϳª ÀÌ»óÀ» ÁöÁ¤ÇÏ¸é ¾È µË´Ï´Ù" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Çò°¥¸®´Â ¾ÐÃà ¿É¼Ç" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "¾Ë ¼ö ¾ø´Â ÆÐÅÏ `%s'" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1369 -msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" -msgstr "" - -#: src/tar.c:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "" -#: src/tar.c:1797 +#: src/tar.c:1796 #, fuzzy msgid "Invalid owner" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¼ÒÀ¯ÀÚ°¡ ÁÖ¾îÁü" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 #, fuzzy msgid "Invalid record size" msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "·¹ÄÚµå Å©±â´Â %dÀÇ ¹è¼ö°¡ µÇ¾î¾ß ÇÕ´Ï´Ù." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "¾Ë ¼ö ¾ø´Â ÆÐÅÏ `%s'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "`-[0-7][lmh]' ¿É¼ÇÀº ÀÌ tar¿¡¼± Áö¿øµÇÁö ¾Ê½À´Ï´Ù" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "´ÙÁß ¾ÆÄ«À̺ê ÆÄÀÏÀº `-M' ¿É¼ÇÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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)" @@ -2273,51 +2289,51 @@ msgstr[0] "" msgstr[1] "" # -#: src/tar.c:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "¾ÐÃàµÈ ´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °»½ÅÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "`-Aru' ¿É¼ÇÀº `-f -'°ú µ¿½Ã¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "`-Acdtrux' ¿É¼Çµé Áß Çϳª¸¦ ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" diff --git a/po/ky.gmo b/po/ky.gmo index 44ecf11..74b9bb0 100644 Binary files a/po/ky.gmo and b/po/ky.gmo differ diff --git a/po/ky.po b/po/ky.po index d9e782d..791270f 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "Бул жардам тизмесин көрсөтөт" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "Колдонуу жөнүндө кыска маалымат көрсөтөт" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "АТЫ" @@ -116,11 +116,11 @@ msgstr "Программага ат кой" msgid "SECS" msgstr "СЕК" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "СЕК секунда күтүңүз (алдынала - 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "программанын версиясын көрсөтөт" @@ -321,11 +321,11 @@ msgstr "Түз шилтеме көрсөтүп турган бош файлды #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "„" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "“" @@ -382,7 +382,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -479,6 +479,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Каталарды бул жерге билдиргиле <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + # Input string дегендин ордуна жакшы нерсе билсеңер алмаштырсаңар болот #: rmt/rmt.c:142 msgid "Input string too long" @@ -516,15 +538,6 @@ msgstr "" " --version Версия маалыматын көрсөт.\n" " --help Бул маалыматты көрсөт.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Каталарды бул жерге билдиргиле <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Издөө даражасы туура эмес" @@ -549,100 +562,100 @@ msgstr "Файлдын соңу эрте келди" msgid "Garbage command" msgstr "Туура эмес команда" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Жазылган жалпы байт" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Алынган жалпы байт" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Өчүрүлгөн жалпы байт: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "record_size мааниси жарабайт" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Архивдин аты берилген жок" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Архивдин stdin/stdout текшерүүсү болбой жатат" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архив кысыштырылган абалда. %s опциясын колдонгула" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Кысыштырылган архивдерди жаңырталбай калды" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Лентанын башына келди, иш бүттү" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Өтө көп ката бар, иш бүттү" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Маалыматтын көлөмү = %lu блок" -#: src/buffer.c:716 +#: src/buffer.c:718 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Архивде түз жайлашпаган блок бар (%lu байт)" -#: src/buffer.c:793 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Архивдеги файл өчпөй калды; архив ачылбаса -i деп колдонгула" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek маалыматтын чегинде токтогон жок" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: жараксыз том номери бар" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Томдун номери батпай калды" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "%2$s үчүн %1$d-томду даярдап Enter'ди басыңыз: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Колдонуучудан жооп күтүбатканда файлдын соңу келип калды" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ЭСКЕРТҮҮ: Архив толук эмес" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -653,72 +666,72 @@ msgstr "" " q\t\ttar программасынын ишин бүтүр\n" "y же Ввод\t\tИшти улант\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Команда строкасын ач\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Бул тизмени жаз\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Жаңы том жок; иш бүттү.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Файлдын аты берилген жок. Кайра жазып көргүлө.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Туура эмес ввод. Жардам үчүн ? жазгыла.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "%s командасы аткарылбай калды" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s бул томдо уланса керек: башкы-маалыматта аты кыскартылыптыр" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s мунун бул томдо уландысы жок" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s көлөмү туура эмес (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Бул том иретте эмес" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Архивдин тамгасы %s менен келишпей жатат" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "%s тому %s менен келишпей жатат" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: файлдын аты көп-томдук GNU башкы-маалымат үчүн өтө узун, кыскартылды" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek маалыматтын чегинде токтогон жок" @@ -733,7 +746,7 @@ msgstr[0] "%2$lu байттан %1$lu гана окулду" msgid "Contents differ" msgstr "Мазмундары окшобойт" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Архивде күтүлбөгөн жерде файлдын соңу бар" @@ -849,7 +862,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "астындагылар кошулган жок" @@ -878,7 +891,7 @@ msgstr "%s: файл архив экен; кошулбайт" msgid "%s: File removed before we read it" msgstr "%s: Файл окулганча өчүрүлүп кетти" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "папка кошулган жок" @@ -972,126 +985,126 @@ msgstr "%s файлы %s деп алмаштыралбай калды" msgid "Error is not recoverable: exiting now" msgstr "Оңолбогон ката: иш бүттү " -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Папканын эски аты %s эле" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Папка алмаштырылды" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Папка жаңы" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Жараксыз убакыт тамгасы" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Алмашуу убагы туура эмес (секундалары)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Алмашуу убагы туура эмес (нано-секундалары)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Аспаптын номери жараксыз " -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Inode номери жараксыз" # фиелд, снэпшот дегендер кандай болот? -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Снэпшот файлды окубатканда ото узун поле чыкты" # snapshot? -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Снэпшот файлды окубатканда ката болду" # snapshot? -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Снэпшот файлда күтүлбөгөн жерде файлдын соңу (EOF) бар" # фиелд кандай болот? snapshot? -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Снэпшот файлда күтүлбөгөн поле(фиелд) бар" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Записьтерди бөлүүчү символ жок" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Файлдын форматы туура эмес" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Форматтын бул версиясы иштетиле албайт: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок %#3o келди" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Кошулуучу папка бузук: 'X' копиялары бар" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Кошулуучу папка бузук: 'R' менен берилген ат бош" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Кошулуучу папка бузук: 'T'дан мурун 'R' жок" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Кошулуучу папка бузук: 'T' менен берилген ат бош" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок датанын соңу келди" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Кошулуучу папка бузук: 'X' эч колдонулган жок" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s шаблонун колдонуп убактылуу жаңы папка ачылган жок" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Папка өчүрүлгөн жок: stat иштебей койду" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: бул папка башка аспапта жайгашкан: өчүрүлбөйт" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s өчүрүлүп жатат\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Өчүрүлбөй жатат" @@ -1323,89 +1336,89 @@ msgstr "" "жөнөкөй вариант\n" " never, simple ар дайым жөнөкөй резерв копиялар сакталат\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Негизги иштөө абалы:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "архивдин ичиндеги файлдарды тизмелейт" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "архивден файлдарды чыгарат" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "жаңы архив жаратат" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "архив менен файл система айырмаларын табат" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "файлдарды архивдин аягына кошот" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "архивдин ичиндегилерден жаңы болгон файлдарды гана кошот" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "tar файлын архивге кошот" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "архивден өчүрөт (магниттик ленталарда жарабайт!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "архивдик томдун атын текшерет анан бүтүрөт" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Иштөөнүн модификаторлору:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "кеңири жайлашкан файлдарды эфектүү түрдө колго ал" # major, minor -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "БАШКЫ[.КИЙИНКИ]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "кеңири жайлаштыруу форматынын версиясын тандайт (--sparce опциясы кошулган " "болот)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "эски GNU форматындагы резервдөө методун колго ал" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "жаңы GNU форматындагы резервдөө методун колго ал" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "окулбаган файлдар келгенде нөл болбогон статус менен ишти бүтүрбө" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1417,119 +1430,119 @@ msgstr "" "файлдардын аттары команда строкасында же -T опциясы менен берилгенде гана " "жарактуу болот. N-дин мааниси алдынала 1ге барабар." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "Архивдин ичиндегилерди издесе болот" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "үстүнө көчүрүү контролу:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "архивди сактагандан кийин текшерүүгө аракет кылат" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "файлдарды архивге кошулгандан кийин өчүрөт" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "файлдарды чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрбө" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "мурун бар болгон файл архивдеги копиясындан жаңы болсо аны алмаштырба" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрөт" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "бар болгон файлдын ордуна көчүрүүдөн мурун ал файлды өчүрөт" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "папканы чыгарардан мурун баардык иерархияларды өчүрөт" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "мурун бар болгон папкалардын мета-касиеттерин корго" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "чыгаруу учурунда бар болгон папкалардын мета-даталардын үстүнө жазылат " "(алдынала тандалат)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Чыгаруу() жолун танда:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "файлдарды стандарт чыгарууга (output) жөнөт" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" "архивден чыккан файлдарды канал(pipe) жолу менен башка программага жөнөтөт" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "туулган процесстердин бүтүрүү кодторуна караба" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "туулган процесстердин нөл болбогон бүтүрүү кодторун ката деп ишке ал" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Файлдын өзгөчөлүктөрүн колго алууда:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "кошулган файлдардын ээсин АТЫ деп кой" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "кошулган файлдардын группасын АТЫ деп кой" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "ДАТА-ЖЕ-ФАЙЛ" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "кошулган файлдардын алмашуу убактысын ДАТА-ЖЕ-ФАЙЛ дан ал" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "УКУК" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "кошулган файлдардын укук абалын УКУК деп кой" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1539,28 +1552,28 @@ msgstr "" "сакта (МЕТОД='replace'; алдынала тандалат) же колдонуу убакыттарын " "алмашырбай туруп сактап кал (МЕТОД='system')" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "файлдын алмаштыруу убактын чыгарбайт" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "ээсин ошол бойдон калтырып файлдарды чыгарууга аракет кылат" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "файлдарды өзүңдүкү катары чыгарат" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "ээси/группа аттарын ардайым номерлер менен көрсөтөт" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "файлдын уруксат маалыматын да чыгар (суперколдонуучуга алдынала тандалат)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1568,15 +1581,15 @@ msgstr "" "архивден уруксат маалыматын чыгарыбатканда колдонуучунун umask'ын колдон " "(жөн колдонуучуларга алдынала тандлат)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "чыгатурган файлдарды архивдегидей кылып сортто" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "-p жана -s менен бирдей" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1584,141 +1597,141 @@ msgstr "" "чыгарылган папкалардын колдонуу убакыттарын жана уруксаттарын чыгаруу иши " "бүткөндөн кийин коёт" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore опциясынын эффектин токтотот" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Аспапты тандоо жана ага өтүү:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "АРХИВ" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "АРХИВ деген архивдик файлды же аспапты колдонот" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "архивдик файлда эки точка болушуна карабастан ал локалдуу" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "rmt'нин ордуна КОМАНДА колдонулат" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "rsh'тын ордуна КОМАНДА колдонулат" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "драйв жана анын тыгыздыгын белгиле" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "көп томдуу архивди жарат/тизмеле/чыгар" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "N x 1024 байт жазгандан кийин лентаны алмаштыр" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "ар лентанын аягында скриптти иштет (-M опциясы колдонулат)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "ФАЙЛ файлынын ичиндеги том номерин колдон/жаңырт" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Аспаптын блоктолушу:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "БЛОК" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "ар маалыматка БЛОК x 512 байт түшөт" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "Ар маалыматка N байт түшөт, 512 көбөйтүндүсү" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "архивдеги нөлдүү блокторду өтүп кетет (EOF жөнүндө)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "окубатканда кайрадан блокторго бөлүп чык (4.2BSD каналдары үчүн)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Архивдин форматын тандоо:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "тандалган форматта архив жаратат" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "ФОРМАТ булардан бирөө болот:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "эски V7 tar форматы" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 версиясында болгондой GNU форматы" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x форматы" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) форматы" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) форматы" # pax деген gid,atime сияктуу нерселер -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "pax менен бирдей" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "--format=v7 менен бирдей" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "--format=posix менен бирдей" # keyword эмне болот? -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ачкыч-сөз[[:]=мааниси][,ачкыч-сөз[[:]=мааниси]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "контролдоо үчүн pax ачкыч сөздөрү" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1726,100 +1739,105 @@ msgstr "" "том аты ТЕКСТ болгон архив жарат; тизмелөө/чыгаруу учурунда, ТЕКСТ дегенди " "том атынын глоб шаблону катары колдон" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Бирбирине келишпеген кысыштыруу опциялары берилди" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "архивди bzip2 менен ишке ал" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "архивди gzip менен ишке ал" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "архивди compress менен ишке ал" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "архивди gzip менен ишке ал" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "архивди gzip менен ишке ал" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "архивди gzip менен ишке ал" + +#: src/tar.c:614 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "ПРОГ менен ишке ал (-d опциясы болушу керек)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Локалдуу файлдарды тандоо:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "ФАЙЛды архивге кош (файлдын аты тире менен баштаган учурда пайдалуу)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "ПАПКА" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "ПАПКА папкасына өт" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "чыгарылатурган же жаңы ачылатурган файлдарды АТЫ деген файлдан кара" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T опциясы нөл менен бүткөн аттарды окуйт, -C опциясы өчүрүлөт" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" "-T менен алынган файлдардын аттарындагы ковычкалар өчүрүлөт (алдынала " "тандалат)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "-T менен алынган файлдардын аттарындагы ковычкалар калаберет" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "ШАБЛОН" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "ШАБЛОН менен уйкаш файлдар ишке алынбайт" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "ФАЙЛда тизмеленген шаблондор менен уйкаш файлдар ишке алынбайт" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1827,92 +1845,92 @@ msgstr "" "CACHEDIR.TAG файлы болгон папкалардын астындагылары тэг файлдан тышкарысы " "кошулбайт" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG файлы болгон папкалардын астындагыларынын баары кошулбайт" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG файлы болгон папкалар кошулбайт" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "ФАЙЛ файлы болгон папкалардын астындагылары ФАЙЛ файлындан тышкарысы " "кошулбайт" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "ФАЙЛ файлы болгон папкалардын астындагыларынын баары кошулбайт" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "ФАЙЛ файлы болгон папкалар кошулбайт" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "папкалардын тереңине кирип кетүүнү токтот" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "архивди жасабатканда локалдуу файл системасында кал" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "папкалардын тереңине кирет (алдынала тандалган)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "файл аттарынын башындагы '/'терди өчүрбө" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "символикалык шилтемелерге барат; алар көрсөткөн файлдарды архивге кошот" -#: src/tar.c:667 +#: src/tar.c:668 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "" "символикалык шилтемелерге барат; алар көрсөткөн файлдарды архивге кошот" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "МҮЧӨНҮН-АТЫ" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "архивдеги МҮЧӨНҮН-АТЫ мүчөсүнөн башта" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "ДАТА-ЖЕ-ФАЙЛ'дан жаңы болгон файлдарды гана сакта" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "датасы алмашканда гана дата жана убактысын салыштыр" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "өчүрөрдөн мурун копиясын сактап кал, CONTROL версиясын танда" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "STRING" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1920,93 +1938,93 @@ msgstr "" "өчүрөрдөн мурун копиясын сактап калат, жалпы колдонулган суфикс кошулат (бул " "суфикс SIMPLE_BACKUP_SUFFIX жолу менен алмаштырылбаган болсо '~' болот)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Файлдын атынын алмашуулары:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "чыгаруу учурунда файл аттарынын башындагы N компонентти алып салат" # выражение кыргызча кандай? СҮЙЛӨМ башка жерде да бар -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "СҮЙЛӨМ" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "файлдардын аттарын алмаштыруу үчүн sed replace EXPRESSION колдонгула" # inclusion, exclusion - Kyrgyz equiv? -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Файлдын атына уйкаштыруу опциялары (бардык шаблондорго тиешелүү):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "тамгалардын чоң-кичинесине каралбайт" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "шаблондор файлдын атынын башталышы менен уйкаштырылат" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" "шаблондор `/' символунан кийин келген ар жерде уйкашына каралат (алдынала " "тандалган)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "уйкаштырууда тамгалардын чоң-кичинесине каралат (алдынала тандалган)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "шаблондор колдонулат (иштен алынбаган файлдарга алдынала тандалат)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "кандай жазылса ошондой колдонулат" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "шаблондор `/' символун издебейт" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "шаблондор `/' символун издейт (алдынала тандалган)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Маалыматтандыруу:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "ишке алынган файлдарды кеңири маалыматы менен тизмеле" # Ушу 'record' сөзүнө жакшы котормо табалбай койдум # 'маалымат' деп жазыбаттым эле, бул жерде келишпей калаткен -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "ар N записьтен кийин маалымат берип турат (алдынала 10 болот)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "баардык шилтемелер кошулбай калса билдирүү жазып чыгар" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:729 +#: src/tar.c:730 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 +2036,27 @@ msgstr "" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 жана SIGUSR2; SIG префикси жазылбаган " "аттарын да колдонсо болот." -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "файлды алмаштыруу датасын UTC түрүндө көрсөт" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "чыккан кеңири маалыматты ФАЙЛ файлына жибер" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "ар билдирүүдө архивдин ичиндеги блок номерин көрсөт" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "ар ишти аткарууга макулдук сурап тур" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "tar'да алдынала коюлган опцияларды көрсөтөт" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2046,33 +2064,33 @@ msgstr "" "тизмелөө же чыгаруу учурунда издөө критериясына жатпаган папкаларды да " "тизмелейт" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "алмаштыруудан кийин файлдын же архивдин аттарын көрсөтөт" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "аттарга ковычка кошуу стилин тандаңыз; жарактуу СТИЛЬ түрдөрү төмөндө " "көрсөтүлөт." -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "STRING ичинде болгон тамгаларга кошумча ковычка кошот" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "STRING ичинде болгон тамгаларга ковычка кошпойт" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Келишүү опциялары:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2080,56 +2098,56 @@ msgstr "" "жаңы архив жасабатканда --old-archive менен бирдей; чыгарыбатканда --no-same-" "owner менен бирдей" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Башка опциялар:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "зыяндуу көрүнгөн опцияларды колдонууга тыюуу салат" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' опцияларынан бирөөнү гана колдоно аласыңар" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Бирбирине келишпеген кысыштыруу опциялары берилди" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Сигналдын аты белгисиз: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Датанын шаблон файлы табылган жок" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Белгисиз %1$s дата форматынын ордуна %2$s коюлат" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "%s опциясы: `%s' датасын %s деп алды" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: файл тизмеси окулган" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: алынган файлдын атында бош тамгалар бар" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style опциясы үчүн мындай аргументтер бар:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2137,161 +2155,157 @@ msgstr "" "\n" "*Бул* tar алдынала мындай иштетилет:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Блок көлөмү жараксыз" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Лентанын узундугу жараксыз" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Бирден көп ченемдөөчү дата бар" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "кеңири жайлаштыруу форматынын версиясы жарактуу эмес" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "Бул платформада --atime-preserve='system' опциясы иштебейт" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "--checkpoint опциясына жазылган аргумент сан эмес" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Жараксыз группа" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Опцияда жарабаган укук абалы берилди" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Жарабаган номер" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Ээси жарабайт" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Маалымат көлөмү жарабайт" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Маалыматтын көлөмү %d көбөйтүндүсү болушу керек." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Элементтердин саны жарабайт" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "--to-command опциясы бир эле жолу жазылыш керек" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Тыгыздык аргументи туура эмес: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Түшүнүксүз тыгыздык: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "*Бул* tar `-[0-7][lmh]' опцияларын иштетпейт" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Эски болгон `%c' опциясына параметр керек." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "Файл тизмеси болбосо --occurrence дегендин мааниси болбойт" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "Колдонулган иштетүү абалда --occurrence колдонулбайт" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Бир нече архив файлы болсо `-M' опциясы колдонулушу керек" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental менен --newer чогу колдонулбайт" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Көп-томдуу архивдерди текшералбай калды" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Кысыштырылган архивдерди текшералбай калды" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Көп-томдуу кысыштырылган архивдерди колдоналбай калды" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Кысыштырылган архивдер кошулалбайт" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option POSIX архивдеринде гана колдонула алат" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Бош архив жаратуудан уялып баш тартып жатат" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "`-Aru' опциялары `-f -' менен келишпейт" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "`-Acdtrux' опцияларынан бирөөнү тандап колдонуңуз" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2659,6 +2673,10 @@ msgstr "--stat опциясы менен файл аттары жазылыш к msgid "too many arguments" msgstr "аргументтердин саны көп" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "" +#~ "Эскертүү: -I опциясы иштетилбейт; балким -j же -T дегиңиз келди эле?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "--delay-directory-restore опциясынын эффектин токтотот" diff --git a/po/ms.gmo b/po/ms.gmo index bb798e8..f0f5fd7 100644 Binary files a/po/ms.gmo and b/po/ms.gmo differ diff --git a/po/ms.po b/po/ms.po index 93f7a88..f08d055 100644 --- a/po/ms.po +++ b/po/ms.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2002-11-23 02:38+0800\n" "Last-Translator: Hasbullah Bin Pit \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -112,11 +112,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -314,12 +314,12 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" # ui/galeon.glade.h:3 -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -374,7 +374,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -471,6 +471,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Lapor pepijat ke .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -507,15 +529,6 @@ msgstr "" " --version Output maklumat versi.\n" " --help Output bantuan ini.\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Lapor pepijat ke .\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -541,105 +554,105 @@ msgstr "Akhir fail tak matang" msgid "Garbage command" msgstr "Arahan sampah" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Jumlah byte ditulis: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Jumlah byte ditulis: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(paip)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Nilai tidak sah bagi record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Tiada nama arkib diberi" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Tak dapat menentusahkan arkib stdin/stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Tak dapat mengemaskini arkib termampat" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Pada permulaan pita, keluar sekarang" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Terlalu banyak ralat, keluar" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: mengandungi nombor volum yg tidak sah" -#: src/buffer.c:914 +#: src/buffer.c:916 #, fuzzy msgid "Volume number overflow" msgstr "Nombor volum melimpah" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF dimana maklumbalas pengguna dijangka" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "AMARAN: Arkib tidak lengkap" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -651,71 +664,71 @@ msgstr "" " ! Spawn subshell\n" " ? Cetak senarai ini\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Tiada volum baru; keluar.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "Arahan '%s' gagal" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s tidak bersambung pada volum ini" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s adalah salah saiz (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Volum ini tidak dalam turutan" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkib tidak dilabelkan supaya memadan %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Volum %s tidak sepadan %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -730,7 +743,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "EOF tanpa diduga pada arkib" @@ -848,7 +861,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -877,7 +890,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -972,124 +985,124 @@ msgstr "%s: Tak dapat menukarnama ke %s" msgid "Error is not recoverable: exiting now" msgstr "Ralat adalah tidak boleh dipulihkan: keluar sekarang" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Direktori telah ditukarnama" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah ditukarnama" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Direktori adalah baru" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Setem masa tidak sah" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Mod tidak sah diberi pada opsyen" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Nombor peranti tidak sah" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Nombot inod tidak sah" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF tanpa diduga pada arkib" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Tak dapat memperuntukkan memori bagi faktor pemblokan %d" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Memadam %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: tak dapat buang" @@ -1299,87 +1312,87 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "EOF tanpa diduga pada arkib" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1387,572 +1400,577 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Ralat ketika menulis ke output piawai" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Tak dapat menentusah arkib multi-volume" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "opsyen format arkib konflik" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Opsyen mampatan konflik" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: fail adalah arkib; tidak dilonggokkan" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: fail adalah arkib; tidak dilonggokkan" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Tak dapat tukar direktori kerja" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Membuang awalan `%.*s' drpd nama ahli" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "Volum %s tidak sepadan %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1960,278 +1978,274 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Anda tak boleh nyatakan lebih drpd satu opsyen `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Opsyen mampatan konflik" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "jenis fail tak diketahui %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Fail tarikh tidak dijumpai" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Mengganti %s bagi format tarikh tak diketahui %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Faktor pemblokan tidak sah" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "panjang pita tidak sah" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Kumpulan tidak sah" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Mod tidak sah diberi pada opsyen" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Nombot inod tidak sah" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Pemilik tidak sah" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Saiz rekod tidak sah" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Saiz rekod mesti dalam gandaan %d." -#: src/tar.c:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "panjang pita tidak sah" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "OPsyen lama `%c' memerlukan hujah." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Fail akrib beraneka memerlukan opsyen `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Tak boleh gabung --listed-incremental dengan --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Tak dapat menentusah arkib multi-volume" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Tak dapat menentusahkan arkib termampat" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Tak dapat menggunakan arkib multi-volume termampat" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Tak dapat mengemaskini arkib termampat" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Secara dayus enggan mencipta arkib kosong" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opsyen `-Aru' tak serasi dengan `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Anda mesti nyatakan satu drpd opsyen `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2583,6 +2597,10 @@ msgstr "Nama fail modul" msgid "too many arguments" msgstr "" +#~ 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?" + #~ msgid "block size" #~ msgstr "saiz blok" diff --git a/po/nb.gmo b/po/nb.gmo index 8850d28..7b0b295 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 3352f1d..cfc994b 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -314,11 +314,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "" @@ -373,7 +373,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -470,6 +470,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Rapporter feil til .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -501,15 +523,6 @@ msgid "" " --help Output this help.\n" msgstr "" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Rapporter feil til .\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "" @@ -534,110 +547,110 @@ msgstr "For tidlig filslutt" msgid "Garbage command" msgstr "Ugyldig kommando" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Totalt antall bytes skrevet: " # -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 #, fuzzy msgid "Total bytes read" msgstr "Totalt antall bytes skrevet: " # -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Totalt antall bytes skrevet: " -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Ugyldig verdi for record_size" # -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Arkivnavn er ikke oppgitt" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Kan ikke verifisere stdin/stdout-arkiv" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" # -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Kan ikke oppdatere komprimerte arkiver" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "På begynnelsen av båndet, avslutter nå" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "For mange feil, avslutter" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 #, 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF der svar fra bruker var forventet" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ADVARSEL: Arkivet er ufullstendig" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -649,71 +662,71 @@ msgstr "" " ! Start et shell\n" " ? Skriv denne listen\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Ikke nytt volum; avslutter.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsetter ikke i dette volumet" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, fuzzy, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har feil størrelse (%ld != %ld + %ld)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dette volumet kommer ute av rekkefølge" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, fuzzy, c-format msgid "Archive not labeled to match %s" msgstr "Arkivet er ikke navngitt for å passe med «%s»" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "Volumet «%s» stemmer ikke overens med «%s»" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "Arkiv %s sluttet ikke ved en blokkgrense" @@ -730,7 +743,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Uventet filslutt i arkivet" @@ -850,7 +863,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 #, fuzzy msgid "contents not dumped" msgstr " (minnet lagret)" @@ -880,7 +893,7 @@ msgstr "%s er arkivet; ikke lagret" msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -975,126 +988,126 @@ msgstr "Kan ikke endre navn p msgid "Error is not recoverable: exiting now" msgstr "" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "Filkatalogen %s har endret navn" -#: src/incremen.c:457 +#: src/incremen.c:460 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "Filkatalogen %s har endret navn" -#: src/incremen.c:502 +#: src/incremen.c:505 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "Filkatalogen %s er ny" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Ugyldig modus gitt i flagg" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 #, fuzzy msgid "Read error in snapshot file" msgstr "Lesefeil på %s" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutt i arkivfilen" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Uventet filslutt i arkivfilen" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan ikke gå til filkatalogen %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" @@ -1309,87 +1322,87 @@ msgstr "" " ellers enkle\n" " never, simple lag enkle sikkerhetskopier\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Uventet filslutt i arkivet" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1397,571 +1410,577 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 #, fuzzy msgid "remove files after adding them to the archive" msgstr "Tar bort enhetsnavn fra navn i arkivet" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Kan ikke verifisere arkiv som går over flere volum" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Arkivér til stdin" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Konflikt i kompresjonsflagg" -#: src/tar.c:596 +#: src/tar.c:595 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Kan ikke skrive til komprimeringsprogrammet" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" -msgstr "" +#: src/tar.c:597 +#, fuzzy +msgid "do not use archive suffix to determine the compression program" +msgstr "Kan ikke skrive til komprimeringsprogrammet" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s er arkivet; ikke lagret" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s er arkivet; ikke lagret" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Kan ikke gå til filkatalogen %s" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" # -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Tar bort ledende «/» fra absolutte linker" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "Volumet «%s» stemmer ikke overens med «%s»" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1969,280 +1988,276 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 #, fuzzy msgid "ask for confirmation for every action" msgstr "Kan ikke lese bekreftelse fra brukeren" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Du kan ikke angi mer enn ett av «-Acdtrux»-flaggene" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Konflikt i kompresjonsflagg" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "Ukjent mønster «%s»" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1369 -msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" -msgstr "" - -#: src/tar.c:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Mer enn én grense-dato" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Ugyldig modus gitt i flagg" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "" -#: src/tar.c:1797 +#: src/tar.c:1796 #, fuzzy msgid "Invalid owner" msgstr "Ugyldig eier gitt i flagg" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 #, fuzzy msgid "Invalid record size" msgstr "Ugyldig verdi for record_size" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Blokkstørrelse må være delbart på %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Ukjent mønster «%s»" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Gammelt flagg «%c» behøver et argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Ved flere arkivfiler behøves «-M»-flagget" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Kan ikke verifisere arkiv som går over flere volum" # -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Kan ikke verifisere komprimerte arkiver" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Kan ikke bruke komprimerte arkiv som går over flere volum" # -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Kan ikke oppdatere komprimerte arkiver" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "For feig til å lage et tomt arkiv" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Flaggene «-Aru» er inkompatible med «-f -»" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Du må angi ett av «-Acdtrux»-flaggene" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" diff --git a/po/nl.gmo b/po/nl.gmo index 97b751b..d1c0c66 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 46ba90f..db3db2d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,22 +1,21 @@ # Dutch translations for tar. -# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # # Elros Cyriatan , 2004. # Benno Schulenberg , 2005, 2006, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: tar-1.20\n" +"Project-Id-Version: tar-1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\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" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2008-12-27 12:51+0100\n" +"Last-Translator: Erwin Poeze \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" #: lib/argmatch.c:133 #, c-format @@ -83,7 +82,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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -94,15 +93,15 @@ msgstr "" msgid "Unknown system error" msgstr "Onbekende systeemfout" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "deze hulptekst tonen" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "een korte gebruikssamenvatting tonen" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NAAM" @@ -115,11 +114,11 @@ msgstr "de programmanaam instellen" msgid "SECS" msgstr "SECONDEN" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "dit aantal seconden pauzeren (standaard 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "programmaversie tonen" @@ -316,11 +315,11 @@ msgstr "Lege doelnaam van harde koppeling wordt vervangen door '.'" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "‘" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "’" @@ -372,10 +371,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -495,6 +495,29 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s en anderen.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Rapporteer gebreken in het programma aan <%s>;\n" +"meld fouten in de vertaling aan .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Invoertekenreeks is te lang" @@ -531,16 +554,6 @@ msgstr "" " --version programmaversie tonen\n" " --help deze hulptekst tonen\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Rapporteer gebreken in het programma aan <%s>;\n" -"meld fouten in de vertaling aan .\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Sprongpositiefout" @@ -565,103 +578,103 @@ msgstr "Voortijdig einde van bestand" msgid "Garbage command" msgstr "Ongeldige opdracht" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Totaal aantal geschreven bytes" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Totaal aantal gelezen bytes" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Totaal aantal verwijderde bytes: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(pijp)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Ongeldige waarde voor recordgrootte" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Geen archiefnaam opgegeven" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Kan archieven op standaardinvoer of -uitvoer niet verifiëren" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archief is gecomprimeerd. Gebruik optie '%s'." -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Kan ingepakte archieven niet bijwerken" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Aan het begin van de band -- tar sluit nu af." -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Te veel fouten -- tar sluit nu af." -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek() is niet gestopt op een recordgrens" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: bevat een ongeldig deelnummer" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Deelnummer-overloop" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "een lege tekst, terwijl gebruikersinvoer werd verwacht" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "WAARSCHUWING: Archief is onvolledig" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -673,65 +686,65 @@ msgstr "" " q tar afbreken\n" " y of Enter doorgaan\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! een subshell starten\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? dit lijstje tonen\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Geen nieuw deel -- tar sluit af.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Geen bestandsnaam opgegeven. Probeer het nog eens.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ongeldige invoer. Typ ? voor hulp.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "Opdracht %s is mislukt" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s gaat niet verder in dit deel" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s heeft een verkeerde grootte (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Dit deel valt buiten de reeks" +msgstr "Dit deel valt buiten de reeks (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Archief is niet gemerkt als overeenkomend met %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Deel %s komt niet overeen met %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -739,10 +752,9 @@ msgstr "" "%s: bestandsnaam is te lang om opgeslagen te worden in een GNU-meerdelenkop; " "afgekapt" -#: src/buffer.c:1619 -#, fuzzy +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek() is niet gestopt op een recordgrens" +msgstr "write is niet gestopt op een blokgrens" #: src/compare.c:96 #, c-format @@ -755,7 +767,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Onverwacht einde-van-bestand in archief" @@ -874,7 +886,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "inhoud niet gearchiveerd" @@ -903,7 +915,7 @@ 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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "map is niet gearchiveerd" @@ -998,124 +1010,124 @@ msgstr "Kan %s niet tot %s hernoemen" msgid "Error is not recoverable: exiting now" msgstr "Fout is niet herstelbaar -- tar sluit nu af." -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Map is hernoemd van %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Map is hernoemd" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Map is nieuw" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Ongeldig tijdsstempel" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Ongeldige wijzigingstijd (seconden)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Ongeldige wijzigingstijd (nanoseconden)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Ongeldig apparaatnummer" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Ongeldig inode-nummer" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Veld is te lang, tijdens lezen van snapshot-bestand" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Leesfout tijdens lezen van snapshot-bestand" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Onverwacht einde-van-bestand in snapshot-bestand" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Onverwachte veldwaarde in snapshot-bestand" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Ontbrekende record-afsluiting" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Onjuiste incrementele bestandsindeling" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Niet-ondersteunde versie (%) van incrementele bestandsindeling" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Onjuiste archiveringsmap: '%c' werd verwacht maar %#3o gevonden" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Onjuiste archiveringsmap: 'X' staat er dubbel" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Onjuiste archiveringsmap: lege naam in 'R'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Onjuiste archiveringsmap: 'T' werd niet voorafgegaan door 'R'" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Onjuiste archiveringsmap: lege naam in 'T'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Onjuiste archiveringsmap: 'X' is nergens gebruikt" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan met sjabloon %s geen tijdelijke map aanmaken" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, 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:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Verwijderen van %s...\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan niet verwijderen" @@ -1338,87 +1350,87 @@ msgstr "" " nil, existing genummerd als ze al bestaan, anders simpel\n" " never, simple altijd simpele reservekopieën maken\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Hoofdbewerkingen:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "de inhoud van een archief opsommen" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "bestanden uit een archief uitpakken" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "een nieuw archief aanmaken" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "verschillen tussen archief en bestandssyteem vinden" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "bestanden aan het eind van een archief toevoegen" -#: src/tar.c:386 +#: src/tar.c:385 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:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "tar-bestanden aan een archief toevoegen" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "uit het archief verwijderen (niet gebruiken bij magneetbanden!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "label van archiefdeel controleren en stoppen" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Werkingsaanpassers:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "luchtige bestanden efficiënt verwerken" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "HOOFD[.SUB]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "versie van te gebruiken luchtige indeling (impliceert '--sparse')" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "oude GNU-indeling van incrementeel archief verwerken" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "BESTAND" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "nieuwe GNU-indeling van incrementeel archief verwerken" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "niet afsluiten met een foutcode bij onleesbare bestanden" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "AANTAL" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1430,125 +1442,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "archief is doorzoekbaar" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" "geen apparaatnummers controleren tijdens aanmaken van incrementele archieven" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" "apparaatnummers controleren tijdens aanmaken van incrementele archieven " "(standaard)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Overschrijvingsopties:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "het archief na het schrijven proberen te verifiëren" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "bestanden na hun toevoeging aan het archief verwijderen" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "bij het uitpakken bestaande bestanden niet vervangen" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "bestaande bestanden bij het uitpakken overschrijven" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "elk bestand verwijderen alvorens eroverheen uit te pakken" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "bestaande mappen leegmaken alvorens eroverheen uit te pakken" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "metagegevens van bestaande mappen behouden" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "de metagegevens van bestaande mappen bij het uitpakken overschrijven " "(standaard)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Selecteren van uitvoerkanaal:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "bestanden uitpakken naar standaarduitvoer" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "OPDRACHT" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "uitgepakte bestanden via pijp naar gegeven programma sluizen" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "afsluitwaardes van dochterprocessen negeren" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" "afsluitwaardes van dochterprocessen die niet nul zijn als fout behandelen" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Behandeling van bestandskenmerken:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "toegevoegde bestanden krijgen NAAM als eigenaar" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "toegevoegde bestanden krijgen NAAM als groep" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATUM-OF-BESTAND" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "WIJZIGINGEN" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "toegevoegde bestanden krijgen (symbolische) WIJZIGINGEN in hun modus" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "MANIER" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1558,27 +1570,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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "bestandswijzigingstijden niet uitpakken" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "bestanden proberen uit te pakken met gelijkblijvende eigenaar" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "bestanden uitpakken als uzelf" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "altijd getallen gebruiken voor gebruikers- en groepsnamen" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "bestandspermissies ook uitpakken (standaard voor root)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1586,17 +1598,17 @@ msgstr "" "de umask van de gebruiker toepassen bij het uitpakken van bestandspermissies " "(standaard voor gewone gebruikers)" -#: src/tar.c:497 +#: src/tar.c:496 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:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "hetzelfde als -p en -s samen" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1604,139 +1616,139 @@ msgstr "" "het zetten van permissies en tijdsstempels van mappen uitstellen tot het " "einde van het uitpakken" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "het effect van de optie --delay-directory-restore ongedaan maken" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Apparaatselectie en -wisseling:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIEF" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "archiefbestand of apparaat ARCHIEF gebruiken" -#: src/tar.c:515 +#: src/tar.c:514 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "deze OPDRACHT gebruiken in plaats van rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "deze OPDRACHT gebruiken in plaats van rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "schijf en dichtheid opgeven" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "meerdelig archief aanmaken/opsommen/uitpakken" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "band wisselen na schrijven van AANTAL x 1024 bytes" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "script uitvoeren aan einde van elke band (impliceert -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "het deelnummer in BESTAND gebruiken/bijwerken" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Blokverwerking:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOKKEN" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKKEN x 512 bytes per record" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "AANTAL bytes per record (een veelvoud van 512)" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "blokken met nullen in archief negeren (betekenen einde-van-bestand)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "doorgaan met lezen tot blok compleet is (voor 4.2BSD-pijpen)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Archiefindelingskeuze:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "INDELING" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "een archief maken in de gekozen indeling" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "INDELING is een van de volgende:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "oude V7 tar-indeling" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU-indeling van tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU-indeling van tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar-indeling)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax-indeling)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "hetzelfde als pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "hetzelfde als --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "hetzelfde als --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "sleutelwoord[[:]=waarde][,sleutelwoord[[:]=waarde]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "het aangeven van pax-sleutelwoorden" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1744,100 +1756,104 @@ msgstr "" "een archief met deelnaam TEKST maken; bij opsommen/uitpakken TEKST als " "zoekpatroon voor de deelnaam gebruiken" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Compressie-opties:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "compressieprogramma afleiden uit bestandsachtervoegsel" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" -msgstr "compressieprogramma afleiden uit bestandsachtervoegsel" +msgid "do not use archive suffix to determine the compression program" +msgstr "compressieprogramma niet afleiden uit bestandsachtervoegsel" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "het archief door 'bzip2' filteren" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "het archief door 'gzip' filteren" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "het archief door 'compress' filteren" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "het archief door 'lzma' filteren" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "het archief door 'gzip' filteren" +msgstr "het archief door 'lzop' filteren" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "het archief door 'gzip' filteren" + +#: src/tar.c:614 msgid "PROG" msgstr "PROGRAMMA" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "het archief door dit programma filteren (moet -d accepteren)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Lokale bestandskeuze:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "MAP" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "naar MAP gaan" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "namen van in of uit te pakken bestanden uit BESTAND halen" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T leest met NUL afgesloten namen, -C uitzetten" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "het resultaat van de vorige --null-optie ongedaan maken" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" "aanhalingstekens verwijderen rond bestandsnamen gelezen met -T (standaard)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "aanhalingstekens niet verwijderen rond bestandsnamen gelezen met -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "PATROON" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "bestanden uitsluiten, gegeven als een PATROON" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "uitsluitingspatronen staan opgesomd in BESTAND" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1845,91 +1861,91 @@ msgstr "" "inhoud van mappen die CACHEDIR.TAG bevatten uitsluiten, behalve CACHEDIR.TAG " "zelf" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "alles onder mappen die CACHEDIR.TAG bevatten uitsluiten" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "mappen die CACHEDIR.TAG bevatten uitsluiten" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "alles onder mappen die BESTAND bevatten uitsluiten" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "mappen die BESTAND bevatten uitsluiten" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "systeemmappen van versiebeheer uitsluiten" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "niet automatisch afdalen in mappen" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "in het lokale bestandssysteem blijven bij maken van archief" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "recursief in mappen afdalen (standaard)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "leidende '/' niet uit bestandsnamen verwijderen" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "LIDNAAM" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "beginnen bij lid LIDNAAM in het archief" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "alleen bestanden opslaan die nieuwer zijn dan DATUM-OF-BESTAND" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATUM" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "datum en tijd alleen vergelijken wanneer gegevens veranderd zijn" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "MANIER" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "voor verwijdering een reservekopie maken, op de aangegeven MANIER" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "TEKENREEKS" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1938,90 +1954,90 @@ msgstr "" "(in plaats van '~', die standaard is tenzij door omgevingsvariable " "SIMPLE_BACKUP_SUFFIX veranderd)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Bestandsnaam-transformaties:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "dit AANTAL leidende componenten uit bestandsnamen verwijderen" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "EXPRESSIE" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "deze vervangings-EXPRESSIE gebruiken om bestandsnamen met 'sed' te " "transformeren" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Bestandsnaamselectie-opties (voor zowel in- als uitsluitingspatronen)" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "verschil tussen hoofd- en kleine letters negeren" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "patronen komen overeen met begin van bestandsnaam" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" "patronen komen overeen met alles na een '/' (is standaard bij uitsluiting)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "hoofdlettergevoelige vergelijking (standaard)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "jokertekens gebruiken (is standaard bij uitsluiting)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "exacte tekenreeksvergelijking" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "jokertekens komen niet overeen met '/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "jokertekens komen overeen met '/' (is standaard bij uitsluiting)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Informatieve uitvoer:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "de verwerkte bestanden opsommen" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "voortgangsberichten tonen voor elk AANTALste record (standaard 10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "ACTIE" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "bij elk controlepunt deze ACTIE uitvoeren" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "een bericht tonen als niet alle links gearchiveerd werden" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2033,27 +2049,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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "bestandswijzigingstijden in UTC tonen" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "breedsprakige uitvoer naar BESTAND sturen" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "blokgetal binnen archief tonen bij elk bericht" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "bij elke actie om toestemming vragen" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "standaardinstellingen van tar tonen" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2061,33 +2077,33 @@ msgstr "" "bij opsommen of uitpakken: elke map opsommen die niet aan zoekcriteria " "voldoet" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "bestands- of archiefnamen na transformatie tonen" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STIJL" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "ook de tekens in TEKENREEKS aanhalen" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "de tekens in TEKENREEKS niet aanhalen" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Compatibiliteitsopties:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2095,56 +2111,56 @@ msgstr "" "bij aanmaken hetzelfde als --old-archive; bij uitpakken hetzelfde als --no-" "same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Andere opties:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "gebruik van mogelijk gevaarlijke opties of opdrachten uitschakelen" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Slechts één van de opties 'Acdtrux' is mogelijk" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Conflicterende compressie-opties" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Onbekende signaalnaam: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Voorbeeldbestand voor tijdsstempel niet gevonden" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Onbekende datumopmaak %2$s wordt vervangen door %1$s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Optie %s: datum '%s' wordt begrepen als %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: bestandenlijst is al gelezen" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: gelezen bestandsnaam bevat een NUL-teken" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Geldige argumenten van --quoting-style zijn:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2152,165 +2168,163 @@ msgstr "" "\n" "*Deze* tar gebruikt de volgende standaardwaarden:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Ongeldige blokindeling" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Ongeldige bandlengte" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Meerdere drempeldata" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Ongeldig versienummer voor luchtige indeling" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' is op dit platform niet mogelijk" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "waarde van --checkpoint is geen geheel getal" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Ongeldige groep" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Ongeldige modus gegeven bij optie" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Ongeldig nummer" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Ongeldige eigenaar" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"De optie --preserve is vervallen, gebruik nu --preserve-permissions --" +"preserve-order" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Ongeldige recordgrootte" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Recordgrootte moet een veelvoud zijn van %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Ongeldig aantal elementen" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Slechts één optie --to-command is toegestaan" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Ongeldig dichtheidsargument: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Onbekende dichtheid: '%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[BESTAND]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Oude optie '%c' vereist een argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "'--occurrence' betekent niets zonder een bestandenlijst" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "'--occurrence' kan niet worden gebruikt in de gevraagde werkingsmodus" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Voor meerdere archiefbestanden is de optie '-M' vereist" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Kan '--listed-incremental' niet met '--newer' combineren" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Kan meerdelige archieven niet verifiëren" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Kan ingepakte archieven niet verifiëren" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Kan geen meerdelige ingepakte archieven gebruiken" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Kan ingepakte archieven niet samenvoegen" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "Deellengte kan niet kleiner zijn dan de recordgrootte" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "--preserve-order en --listed-incremental gaan niet samen" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Een geheel leeg archief wordt niet aangemaakt" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opties '-Aru' gaan niet samen met '-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "U dient een van de opties '-Acdtrux' op te geven" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Stopt met foutstatus vanwege eerdere fouten" #: src/update.c:86 #, c-format @@ -2580,12 +2594,12 @@ msgstr "Kan status van %s niet bepalen" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "gevraagde bestandslengte %lu, werkelijk %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "aangemaakt bestand is niet luchtig" #: tests/genfile.c:353 #, c-format @@ -2678,9 +2692,9 @@ msgstr "'--stat' vereist bestandsnamen" 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 "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?" #~ msgid "Error exit delayed from previous errors" #~ msgstr "Uitgestelde afbreking na eerdere fouten" diff --git a/po/pl.gmo b/po/pl.gmo index f6bec1f..a2b793f 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index adf9e02..de6d277 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,19 +1,21 @@ # Polish translation of GNU tar # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. -# Rafa³ Maszkowski , 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007, 2008. -# Thanks to Jakub Bogusz for remarks and corrections, 2003, 2004, 2007 +# Rafał Maszkowski , 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007, 2008. +# Thanks to Jakub Bogusz for remarks and corrections, 2003, 2004, 2007, 2008 +# +# my „smart" mutt needs this line # msgid "" msgstr "" -"Project-Id-Version: tar 1.20\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-04-14 23:00+0200\n" -"Last-Translator: Rafa³ Maszkowski \n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2008-12-27 23:59+0200\n" +"Last-Translator: Rafał Maszkowski \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -21,7 +23,7 @@ msgstr "" #: lib/argmatch.c:133 #, c-format msgid "invalid argument %s for %s" -msgstr "b³êdny argument %s opcji %s" +msgstr "błędny argument %s opcji %s" #: lib/argmatch.c:134 #, c-format @@ -31,22 +33,22 @@ msgstr "niejednoznaczny argument %s opcji %s" #: lib/argmatch.c:153 #, c-format msgid "Valid arguments are:" -msgstr "Prawid³owe argumenty to:" +msgstr "Prawidłowe argumenty to:" #: lib/argp-help.c:147 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -msgstr "ARGP_HELP_FMT: warto¶æ %s jest mniejsza lub równa %s" +msgstr "ARGP_HELP_FMT: wartość %s jest mniejsza lub równa %s" #: lib/argp-help.c:220 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" -msgstr "%.*s: Parametr ARGP_HELP_FMT wymaga podania warto¶ci" +msgstr "%.*s: Parametr ARGP_HELP_FMT wymaga podania wartości" #: lib/argp-help.c:226 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter must be positive" -msgstr "%.*s: Parametr ARGP_HELP_FMT musi byæ dodatni" +msgstr "%.*s: Parametr ARGP_HELP_FMT musi być dodatni" #: lib/argp-help.c:235 #, c-format @@ -56,19 +58,19 @@ msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT" #: lib/argp-help.c:247 #, c-format msgid "Garbage in ARGP_HELP_FMT: %s" -msgstr "¦mieci w ARGP_HELP_FMT: %s" +msgstr "Śmieci w 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 "" -"Argumenty obowi±zkowe lub opcjonalne dla opcji d³ugich s± równie¿ " -"obowi±zkowe lub opcjonalne równie¿ dla odpowiadaj±cych im opcji krótkich." +"Argumenty obowiązkowe lub opcjonalne dla opcji długich są również " +"obowiązkowe lub opcjonalne również dla odpowiadających im opcji krótkich." #: lib/argp-help.c:1639 msgid "Usage:" -msgstr "Sk³adnia:" +msgstr "Składnia:" #: lib/argp-help.c:1643 msgid " or: " @@ -81,26 +83,26 @@ msgstr "[OPCJE...]" #: lib/argp-help.c:1682 #, c-format 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" +msgstr "Użyj `%s --help' albo `%s --usage' żeby otrzymać więcej informacji\n" -#: lib/argp-help.c:1710 src/tar.c:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" -msgstr "Raporty o b³êdach nale¿y wysy³aæ do %s .\n" +msgstr "Raporty o błędach należy wysyłać do %s .\n" #: lib/argp-help.c:1929 lib/error.c:125 msgid "Unknown system error" -msgstr "Nieznany b³±d systemu" +msgstr "Nieznany błąd systemu" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" -msgstr "wy¶wietlenie tego opisu" +msgstr "wyświetlenie tego opisu" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" -msgstr "krótka informacja o opcjach" +msgstr "krótka informacja o opcjach" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NAZWA" @@ -113,31 +115,31 @@ msgstr "ustawienie nazwy programu" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" -msgstr "poczekaj SEK sekund (domy¶lnie 3600)" +msgstr "poczekaj SEK sekund (domyślnie 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "informacja o wersji programu" #: lib/argp-parse.c:158 #, c-format msgid "(PROGRAM ERROR) No version known!?" -msgstr "(B£¡D PROGRAMU) Nieznana wersja!?" +msgstr "(BŁĄD PROGRAMU) Nieznana wersja!?" #: lib/argp-parse.c:611 #, c-format msgid "%s: Too many arguments\n" -msgstr "%s: Za du¿o argumentów\n" +msgstr "%s: Za dużo argumentów\n" #: lib/argp-parse.c:754 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "(B£¡D PROGRAMU) Opcja powinna by³a byæ rozpoznana!?" +msgstr "(BŁĄD PROGRAMU) Opcja powinna była być rozpoznana!?" #: lib/closeout.c:112 msgid "write error" -msgstr "b³±d zapisu" +msgstr "błąd zapisu" #: lib/getopt.c:526 lib/getopt.c:542 #, c-format @@ -147,12 +149,12 @@ msgstr "%s: opcja ~%s' jest niejednoznaczna\n" #: lib/getopt.c:575 lib/getopt.c:579 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s: opcja `--%s' nie mo¿e mieæ argumentu\n" +msgstr "%s: opcja `--%s' nie może mieć argumentu\n" #: lib/getopt.c:588 lib/getopt.c:593 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s: opcja `%c%s' nie mo¿e mieæ argumentu\n" +msgstr "%s: opcja `%c%s' nie może mieć argumentu\n" #: lib/getopt.c:636 lib/getopt.c:655 lib/getopt.c:971 lib/getopt.c:990 #, c-format @@ -177,7 +179,7 @@ msgstr "%s: nielegalna opcja -- %c\n" #: lib/getopt.c:768 lib/getopt.c:771 #, c-format msgid "%s: invalid option -- %c\n" -msgstr "%s: b³êdna opcja -- %c\n" +msgstr "%s: błędna opcja -- %c\n" #: lib/getopt.c:823 lib/getopt.c:839 lib/getopt.c:1043 lib/getopt.c:1061 #, c-format @@ -192,21 +194,21 @@ msgstr "%s: opcja `-W %s' jest niejednoznaczna\n" #: lib/getopt.c:932 lib/getopt.c:950 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s: opcja `-W %s' nie mo¿e mieæ argumentu\n" +msgstr "%s: opcja `-W %s' nie może mieć argumentu\n" #: lib/obstack.c:423 lib/obstack.c:425 lib/xalloc-die.c:34 src/extract.c:1374 msgid "memory exhausted" -msgstr "brak pamiêci" +msgstr "brak pamięci" #: lib/openat-die.c:35 #, c-format msgid "unable to record current working directory" -msgstr "nie uda³o siê zapisaæ bie¿acego katalogu" +msgstr "nie udało się zapisać bieżacego katalogu" #: 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" +msgstr "nie udało się powrócić do początkowego katalogu bieżącego" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because @@ -215,7 +217,7 @@ msgstr "nie uda #: lib/paxerror.c:58 lib/paxerror.c:71 #, c-format msgid "%s: Cannot %s" -msgstr "%s: Nie mo¿na %s" +msgstr "%s: Nie można %s" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because @@ -224,72 +226,72 @@ msgstr "%s: Nie mo #: lib/paxerror.c:84 #, c-format msgid "%s: Warning: Cannot %s" -msgstr "%s: Uwaga: Nie mo¿na %s" +msgstr "%s: Uwaga: Nie można %s" #: lib/paxerror.c:93 #, c-format msgid "%s: Cannot change mode to %s" -msgstr "%s: Nie mo¿na zmieniæ uprawnieñ na %s" +msgstr "%s: Nie można zmienić uprawnień na %s" #: lib/paxerror.c:101 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" -msgstr "%s: Nie mo¿na zmieniæ w³a¶ciciela na uid %lu, gid %lu" +msgstr "%s: Nie można zmienić właściciela na uid %lu, gid %lu" #: lib/paxerror.c:127 #, c-format msgid "%s: Cannot hard link to %s" -msgstr "%s: Nie mo¿na utworzyæ ³±cza do %s" +msgstr "%s: Nie można utworzyć łącza do %s" #: lib/paxerror.c:179 lib/paxerror.c:211 #, 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: B³±d czytania, bajt %s, przy czytaniu %lu bajtu" -msgstr[1] "%s: B³±d czytania, bajt %s, przy czytaniu %lu bajtów" -msgstr[2] "%s: B³±d czytania, bajt %s, przy czytaniu %lu bajtów" +msgstr[0] "%s: Błąd czytania, bajt %s, przy czytaniu %lu bajtu" +msgstr[1] "%s: Błąd czytania, bajt %s, przy czytaniu %lu bajtów" +msgstr[2] "%s: Błąd czytania, bajt %s, przy czytaniu %lu bajtów" #: lib/paxerror.c:192 #, 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: Uwaga: B³±d czytania, bajt %s, przy czytaniu %lu bajtu" -msgstr[1] "%s: Uwaga: B³±d czytania, bajt %s, przy czytaniu %lu bajtów" -msgstr[2] "%s: Uwaga: B³±d czytania, bajt %s, przy czytaniu %lu bajtów" +msgstr[0] "%s: Uwaga: Błąd czytania, bajt %s, przy czytaniu %lu bajtu" +msgstr[1] "%s: Uwaga: Błąd czytania, bajt %s, przy czytaniu %lu bajtów" +msgstr[2] "%s: Uwaga: Błąd czytania, bajt %s, przy czytaniu %lu bajtów" #: lib/paxerror.c:259 #, c-format msgid "%s: Cannot seek to %s" -msgstr "%s: Nie mo¿na ustawiæ pozycji %s" +msgstr "%s: Nie można ustawić pozycji %s" #: lib/paxerror.c:275 #, c-format msgid "%s: Warning: Cannot seek to %s" -msgstr "%s: Uwaga: Nie mo¿na ustawiæ wska¼nika na %s" +msgstr "%s: Uwaga: Nie można ustawić wskaźnika na %s" #: lib/paxerror.c:284 #, c-format msgid "%s: Cannot create symlink to %s" -msgstr "%s: Nie mo¿na by³o utworzyæ ³±cza symbolicznego do %s" +msgstr "%s: Nie można było utworzyć łącza symbolicznego do %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: Mo¿na by³o zapisaæ tylko %lu z %lu bajtu" -msgstr[1] "%s: Mo¿na by³o zapisaæ tylko %lu z %lu bajtów" -msgstr[2] "%s: Mo¿na by³o zapisaæ tylko %lu z %lu bajtów" +msgstr[0] "%s: Można było zapisać tylko %lu z %lu bajtu" +msgstr[1] "%s: Można było zapisać tylko %lu z %lu bajtów" +msgstr[2] "%s: Można było zapisać tylko %lu z %lu bajtów" #: lib/paxnames.c:155 #, c-format msgid "Removing leading `%s' from member names" -msgstr "Usuniêcie pocz±tkowego `%s' z nazw plików" +msgstr "Usunięcie początkowego `%s' z nazw plików" #: lib/paxnames.c:156 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "" -"Usuniêcie pocz±tkowego `%s' z nazw plików wskazywanych przez ³±cza zwyk³e" +"Usunięcie początkowego `%s' z nazw plików wskazywanych przez łącza zwykłe" #: lib/paxnames.c:169 msgid "Substituting `.' for empty member name" @@ -297,7 +299,7 @@ msgstr "Podstawienie `.' zamiast pustej nazwy" #: lib/paxnames.c:170 msgid "Substituting `.' for empty hard link target" -msgstr "Podstawienie `.' zamiast pustej nazwy wskazywanej przez ³±cze zwyk³e" +msgstr "Podstawienie `.' zamiast pustej nazwy wskazywanej przez łącze zwykłe" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -318,11 +320,11 @@ msgstr "Podstawienie `.' zamiast pustej nazwy wskazywanej przez #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -349,7 +351,7 @@ msgstr "^[nN]" #: lib/rtapelib.c:299 #, c-format msgid "exec/tcp: Service not available" -msgstr "exec/tcp: Us³uga niedostêpna" +msgstr "exec/tcp: Usługa niedostępna" #: lib/rtapelib.c:303 #, c-format @@ -364,7 +366,7 @@ msgstr "stdout" #: lib/rtapelib.c:512 #, c-format msgid "Cannot execute remote shell" -msgstr "Nie mo¿na uruchomiæ zdalnego shella" +msgstr "Nie można uruchomić zdalnego shella" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's @@ -374,19 +376,20 @@ msgid "(C)" msgstr "(C)" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" "\n" -"Licencja GPLv3+: GNU GPL wersja 3 albo pó¼niejsza \n" -"To jest wolne oprogramowanie: mo¿esz je modyfikowaæ i rozpowszechniaæ.\n" -"Autorzy NIE DAJ¡ GWARANCJI w granicach dozwolonych prawem.\n" +"To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n" +"Autorzy NIE DAJĄ GWARANCJI w granicach dozwolonych prawem.\n" "\n" #. TRANSLATORS: %s denotes an author name. @@ -497,26 +500,48 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s i innych.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Raporty o błędach należy wysyłać do %s .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" -msgstr "Za d³ugi napis na wej¶ciu" +msgstr "Za długi napis na wejściu" #: rmt/rmt.c:161 msgid "Number syntax error" -msgstr "B³±d syntaktyczny w liczbie" +msgstr "Błąd syntaktyczny w liczbie" #: rmt/rmt.c:180 msgid "rmtd: Cannot allocate buffer space\n" -msgstr "rmtd: Nie mo¿na przydzieliæ miejsca na bufor\n" +msgstr "rmtd: Nie można przydzielić miejsca na bufor\n" #: rmt/rmt.c:182 msgid "Cannot allocate buffer space" -msgstr "Nie mo¿na przydzieliæ miejsca na bufor" +msgstr "Nie można przydzielić miejsca na bufor" #: rmt/rmt.c:304 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "Spróbuj `%s --help' ¿eby otrzymaæ wiêcej informacji\n" +msgstr "Spróbuj `%s --help' żeby otrzymać więcej informacji\n" #: rmt/rmt.c:308 #, c-format @@ -527,24 +552,15 @@ msgid "" " --version Output version info.\n" " --help Output this help.\n" msgstr "" -"Sk³adnia: %s [OPCJA]\n" -"Manipulacja napêdem ta¶mowym, przyjmowanie komend od zdalnych procesów.\n" +"Składnia: %s [OPCJA]\n" +"Manipulacja napędem taśmowym, przyjmowanie komend od zdalnych procesów.\n" "\n" " --version Wypisanie informacji o wersji.\n" " --help Pokazanie informacji o opcjach.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Raporty o b³êdach nale¿y wysy³aæ do %s .\n" - #: rmt/rmt.c:397 msgid "Seek offset error" -msgstr "B³±d pozycji w pliku" +msgstr "Błąd pozycji w pliku" #: rmt/rmt.c:406 rmt/rmt.c:547 rmt/rmt.c:557 msgid "Seek offset out of range" @@ -552,7 +568,7 @@ msgstr "Pozycja w pliku poza zakresem" #: rmt/rmt.c:428 msgid "Seek direction out of range" -msgstr "Sposób ustawiania pozycji w pliku spoza zakresu" +msgstr "Sposób ustawiania pozycji w pliku spoza zakresu" #: rmt/rmt.c:472 msgid "rmtd: Premature eof\n" @@ -566,242 +582,241 @@ msgstr "Przedwczesny koniec pliku" msgid "Garbage command" msgstr "Bezsensowna komenda" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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" +msgstr "To nie wygląda jak archiwum tar" -#: src/buffer.c:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" -msgstr "Licza zapisanych bajtów" +msgstr "Licza zapisanych bajtów" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" -msgstr "Liczba przeczytanych bajtów" +msgstr "Liczba przeczytanych bajtów" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" -msgstr "Liczba skasowanych bajtów: %s\n" +msgstr "Liczba skasowanych bajtów: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" -msgstr "B³êdna warto¶æ record_size" +msgstr "Błędna wartość record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Nie podana nazwa archiwum" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" -msgstr "Nie mo¿na zweryfikowaæ archiwum z/do stdin/stdout" +msgstr "Nie można zweryfikować archiwum z/do stdin/stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" -msgstr "Archiwum jest skompresowane. Nale¿y u¿yæ opcji %s" +msgstr "Archiwum jest skompresowane. Należy użyć opcji %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" -msgstr "Nie mo¿na uaktualniæ archiwum skompresowanego" +msgstr "Nie można uaktualnić archiwum skompresowanego" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" -msgstr "Na pocz±tku ta¶my, teraz koñczê" +msgstr "Na początku taśmy, teraz kończę" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" -msgstr "Za du¿o b³êdów, koñczê" +msgstr "Za dużo błędów, kończę" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Rozmiar rekordu = %lu blok" msgstr[1] "Rozmiar rekordu = %lu bloki" -msgstr[2] "Rozmiar rekordu = %lu bloków" +msgstr[2] "Rozmiar rekordu = %lu bloków" -#: src/buffer.c:716 +#: src/buffer.c:718 #, 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" +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 +#: src/buffer.c:795 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" +msgstr "Nie można się cofnąć w pliku archiwum; może nie być czytelny bez -i" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" -msgstr "rmtlseek nie zatrzyma³ siê na granicy rekordów" +msgstr "rmtlseek nie zatrzymał się na granicy rekordów" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" -msgstr "%s: zawiera b³êdny numer czê¶ci" +msgstr "%s: zawiera błędny numer części" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" -msgstr "Przepe³nienie numeru czê¶ci" +msgstr "Przepełnienie numeru części" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " -msgstr "Przygotuj czê¶æ numer %d dla %s i naci¶nij return: " +msgstr "Przygotuj część numer %d dla %s i naciśnij return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" -msgstr "EOF kiedy by³a oczekiwana odpowied¼ u¿ytkownika" +msgstr "EOF kiedy była oczekiwana odpowiedź użytkownika" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 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:954 +# rare case when `for parts' translates into `części' for both sing. and plural in Polish - rzm +#: src/buffer.c:956 #, 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 nazwa Podanie nowej nazwy dla nastêpnej (i kolejnych) czê¶ci\n" -" q Zakoñczenie programu tar\n" +" n nazwa Podanie nowej nazwy dla następnej (i kolejnych) części\n" +" q Zakończenie programu tar\n" " y albo Enter Kontynuacja\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" -msgstr " ! Uruchomienie pow³oki\n" +msgstr " ! Uruchomienie powłoki\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Wypisanie tej listy\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" -msgstr "Brak nowej czê¶ci; zakoñczenie pracy.\n" +msgstr "Brak nowej części; zakończenie pracy.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" -msgstr "Brak nazwy pliku. Spróbuj jeszcze raz.\n" +msgstr "Brak nazwy pliku. Spróbuj jeszcze raz.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -"B³êdne dane wej¶ciowe. Wci¶nij ? ¿eby przeczytaæ informacje pomocnicze\n" +"Błędne dane wejściowe. Wciśnij ? żeby przeczytać informacje pomocnicze\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" -msgstr "%s polecenie zwróci³o b³±d" +msgstr "%s polecenie zwróciło błąd" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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ê" +"%s prawdopodobnie jest kontynuowany w tej części: nagłówek zawiera skróconą " +"nazwę" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" -msgstr "%s nie jest kontynuowany w tej czê¶ci" +msgstr "%s nie jest kontynuowany w tej części" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" -msgstr "%s to z³y rozmiar (%s != %s + %s)" +msgstr "%s to zły rozmiar (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Ta czê¶æ nie jest kolejn±" +msgstr "Ta część nie jest w kolejności (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Etykieta archiwum nie pasuje do %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" -msgstr "Czê¶æ %s nie pasuje do %s" +msgstr "Część %s nie pasuje do %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -"%s: nazwa pliku jest za d³uga do zapisania w nag³ówku wieloczê¶ciowego " -"archiwum GNU, zostanie skrócona" +"%s: nazwa pliku jest za długa do zapisania w nagłówku wieloczęściowego " +"archiwum GNU, zostanie skrócona" -#: src/buffer.c:1619 -#, fuzzy +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek nie zatrzyma³ siê na granicy rekordów" +msgstr "zapis nie zakończył się na granicy bloków" #: 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] "Mo¿na by³o przeczytaæ tylko %lu z %lu bajtu" -msgstr[1] "Mo¿na by³o przeczytaæ tylko %lu z %lu bajtów" -msgstr[2] "Mo¿na by³o przeczytaæ tylko %lu z %lu bajtów" +msgstr[0] "Można było przeczytać tylko %lu z %lu bajtu" +msgstr[1] "Można było przeczytać tylko %lu z %lu bajtów" +msgstr[2] "Można było przeczytać tylko %lu z %lu bajtów" #: src/compare.c:106 src/compare.c:388 msgid "Contents differ" -msgstr "Zawarto¶ci siê ró¿ni±" +msgstr "Zawartości się różnią" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Nieoczekiwany EOF w archiwum" #: src/compare.c:180 src/compare.c:196 src/compare.c:314 src/compare.c:412 msgid "File type differs" -msgstr "Ró¿ne typy plików" +msgstr "Różne typy plików" #: src/compare.c:183 src/compare.c:203 src/compare.c:328 msgid "Mode differs" -msgstr "Uprawnienia siê ró¿ni±" +msgstr "Uprawnienia się różnią" #: src/compare.c:206 msgid "Uid differs" -msgstr "Uid siê ró¿ni" +msgstr "Uid się różni" #: src/compare.c:208 msgid "Gid differs" -msgstr "Gid siê ró¿ni" +msgstr "Gid się różni" #: src/compare.c:212 msgid "Mod time differs" -msgstr "Czas modyfikacji siê ró¿ni" +msgstr "Czas modyfikacji się różni" #: src/compare.c:216 src/compare.c:420 msgid "Size differs" -msgstr "Rozmiar siê ró¿ni" +msgstr "Rozmiar się różni" #: src/compare.c:270 #, c-format msgid "Not linked to %s" -msgstr "Nie do³±czony do %s" +msgstr "Nie dołączony do %s" #: src/compare.c:293 msgid "Symlink differs" -msgstr "£±cze symboliczne siê ró¿ni" +msgstr "Łącze symboliczne się różni" #: src/compare.c:322 msgid "Device number differs" -msgstr "Ró¿ni± siê numery urz±dzeñ" +msgstr "Różnią się numery urządzeń" #: src/compare.c:462 #, c-format @@ -811,23 +826,23 @@ msgstr "Sprawdzanie " #: src/compare.c:469 #, c-format msgid "%s: Unknown file type `%c', diffed as normal file" -msgstr "%s: Nieznany typ pliku `%c' porównywany jako zwyk³y plik" +msgstr "%s: Nieznany typ pliku `%c' porównywany jako zwykły plik" #: src/compare.c:524 msgid "Archive contains file names with leading prefixes removed." -msgstr "Archiwum zawiera nazwy plików bez pocz±tkowych elementów ¶cie¿ek." +msgstr "Archiwum zawiera nazwy plików bez początkowych elementów ścieżek." #: src/compare.c:526 msgid "Verification may fail to locate original files." -msgstr "Podczas weryfikacji mog± nie byæ znalezione pliki lokalne" +msgstr "Podczas weryfikacji mogą nie być znalezione pliki lokalne" #: src/compare.c:596 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" -msgstr[0] "B£¡D WERYFIKACJI: wykryto %d b³êdny nag³ówek" -msgstr[1] "B£¡D WERYFIKACJI: wykryto %d b³êdne nag³ówki" -msgstr[2] "B£¡D WERYFIKACJI: wykryto %d b³êdnych nag³ówków" +msgstr[0] "BŁĄD WERYFIKACJI: wykryto %d błędny nagłówek" +msgstr[1] "BŁĄD WERYFIKACJI: wykryto %d błędne nagłówki" +msgstr[2] "BŁĄD WERYFIKACJI: wykryto %d błędnych nagłówków" #: src/compare.c:612 src/list.c:144 #, c-format @@ -837,55 +852,55 @@ msgstr "Samotny blok zerowy przy %s" #: src/create.c:67 #, c-format msgid "%s: contains a cache directory tag %s; %s" -msgstr "%s: zawiera znacznik katalogu pamiêci podrêcznej %s; %s" +msgstr "%s: zawiera znacznik katalogu pamięci podręcznej %s; %s" #: src/create.c:272 #, c-format msgid "value %s out of %s range %s..%s; substituting %s" -msgstr "warto¶æ %s z %s poza zakresem %s..%s; podstawione %s" +msgstr "wartość %s z %s poza zakresem %s..%s; podstawione %s" #: src/create.c:278 #, c-format msgid "value %s out of %s range %s..%s" -msgstr "warto¶æ %s z %s poza zakresem %s..%s" +msgstr "wartość %s z %s poza zakresem %s..%s" # hm? - rzm #: src/create.c:338 msgid "Generating negative octal headers" -msgstr "Tworzenie ujemnych nag³ówków ósemkowych" +msgstr "Tworzenie ujemnych nagłówków ósemkowych" #: src/create.c:624 src/create.c:687 #, c-format msgid "%s: file name is too long (max %d); not dumped" -msgstr "%s: nazwa pliku jest za d³uga (powy¿ej %d); nie zosta³a zapisana" +msgstr "%s: nazwa pliku jest za długa (powyżej %d); nie została zapisana" #: src/create.c:634 #, c-format msgid "%s: file name is too long (cannot be split); not dumped" msgstr "" -"%s: nazwa pliku jest za d³uga (nie mo¿e byæ podzielona); nie zosta³a zapisana" +"%s: nazwa pliku jest za długa (nie może być podzielona); nie została zapisana" #: src/create.c:661 #, c-format msgid "%s: link name is too long; not dumped" -msgstr "%s: nazwa ³±cza jest za d³uga; nie zosta³a zapisana" +msgstr "%s: nazwa łącza jest za długa; nie została zapisana" #: 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: Plik skurczy³ siê o %s bajt; jest dope³niany zerami" -msgstr[1] "%s: Plik skurczy³ siê o %s bajty; jest dope³niany zerami" -msgstr[2] "%s: Plik skurczy³ siê o %s bajtów; jest dope³niany zerami" +msgstr[0] "%s: Plik skurczył się o %s bajt; jest dopełniany zerami" +msgstr[1] "%s: Plik skurczył się o %s bajty; jest dopełniany zerami" +msgstr[2] "%s: Plik skurczył się o %s bajtów; jest dopełniany zerami" #: src/create.c:1177 #, c-format msgid "%s: file is on a different filesystem; not dumped" -msgstr "%s: plik w innym systemie plików; nie zosta³ zapisany" +msgstr "%s: plik w innym systemie plików; nie został zapisany" -#: src/create.c:1221 src/create.c:1232 src/incremen.c:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" -msgstr "zawarto¶æ nie zosta³a zapisana" +msgstr "zawartość nie została zapisana" #: src/create.c:1361 #, c-format @@ -895,36 +910,36 @@ msgstr "%s: Nieznany typ pliku; plik zignorowany" #: src/create.c:1464 #, c-format msgid "Missing links to %s.\n" -msgstr "Brakuj±ce ³±cza do %s.\n" +msgstr "Brakujące łącza do %s.\n" #: src/create.c:1535 #, c-format msgid "%s: file is unchanged; not dumped" -msgstr "%s: plik jest niezmieniony; nie zosta³ zapisany" +msgstr "%s: plik jest niezmieniony; nie został zapisany" #: src/create.c:1543 #, c-format msgid "%s: file is the archive; not dumped" -msgstr "%s: plik jest w tym archiwum; nie zosta³ zapisany" +msgstr "%s: plik jest w tym archiwum; nie został zapisany" #: src/create.c:1573 #, c-format msgid "%s: File removed before we read it" -msgstr "%s: Plik usuniêty zanim zosta³ przeczytany" +msgstr "%s: Plik usunięty zanim został przeczytany" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" -msgstr "katalog nie zosta³ zapisany" +msgstr "katalog nie został zapisany" #: src/create.c:1659 #, c-format msgid "%s: file changed as we read it" -msgstr "%s: plik zmieni³ siê w trakcie czytania" +msgstr "%s: plik zmienił się w trakcie czytania" #: src/create.c:1739 #, c-format msgid "%s: socket ignored" -msgstr "%s: zignorowane gniazdo z nazw±" +msgstr "%s: zignorowane gniazdo z nazwą" #: src/create.c:1744 #, c-format @@ -933,39 +948,39 @@ msgstr "%s: zignorowany plik door" #: src/delete.c:216 src/list.c:181 src/update.c:170 msgid "Skipping to next header" -msgstr "Przeskoczenie do nastêpnego nag³ówka" +msgstr "Przeskoczenie do następnego nagłówka" #: src/delete.c:281 msgid "Deleting non-header from archive" -msgstr "Kasowanie z archiwum nie-nag³ówka" +msgstr "Kasowanie z archiwum nie-nagłówka" #: src/extract.c:198 #, c-format msgid "%s: implausibly old time stamp %s" -msgstr "%s: niemo¿liwie stara data %s" +msgstr "%s: niemożliwie stara data %s" #: src/extract.c:215 #, c-format msgid "%s: time stamp %s is %s s in the future" -msgstr "%s: znacznik czasowy %s jest przesuniêty o %s s w przysz³o¶æ" +msgstr "%s: znacznik czasowy %s jest przesunięty o %s s w przyszłość" #: src/extract.c:395 #, c-format msgid "%s: Unexpected inconsistency when making directory" -msgstr "%s: Nieoczekiwana niespójno¶æ przy zak³adaniu katalogu" +msgstr "%s: Nieoczekiwana niespójność przy zakładaniu katalogu" #: src/extract.c:588 #, c-format msgid "%s: Directory renamed before its status could be extracted" -msgstr "%s: Katalog zmieni³ nazwê zanim mo¿na by³o odtworzyæ jego status" +msgstr "%s: Katalog zmienił nazwę zanim można było odtworzyć jego status" #: src/extract.c:724 msgid "Extracting contiguous files as regular files" -msgstr "Odtwarzanie plików ci±g³ych (nie sparse) jako zwyk³ych" +msgstr "Odtwarzanie plików ciągłych (nie sparse) jako zwykłych" #: src/extract.c:997 msgid "Attempting extraction of symbolic links as hard links" -msgstr "Próba odtworzenia ³±cza symbolicznego jako zwyk³ego" +msgstr "Próba odtworzenia łącza symbolicznego jako zwykłego" #: src/extract.c:1054 #, c-format @@ -975,16 +990,16 @@ msgstr "Czytam %s\n" #: 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" +msgstr "%s: Nie można odtworzyć -- plik jest kontynuowany z innej części" #: src/extract.c:1150 src/list.c:1090 msgid "Unexpected long name header" -msgstr "Niespodziewany nag³ówek z d³ug± nazw±" +msgstr "Niespodziewany nagłówek z długą nazwą" #: 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" +msgstr "%s: Nieznany typ pliku `%c', odtworzony jako plik zwykły" #: src/extract.c:1181 #, c-format @@ -994,142 +1009,142 @@ msgstr "Aktualny %s jest nowszy albo w tym samym wieku" #: 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" +msgstr "%s: Nie można było zrobić kopii zapasowej tego pliku" #: src/extract.c:1355 #, c-format msgid "Cannot rename %s to %s" -msgstr "Nie mo¿na przemianowaæ %s na %s" +msgstr "Nie można przemianować %s na %s" #: src/extract.c:1367 #, c-format msgid "Error is not recoverable: exiting now" -msgstr "B³±d nie do naprawienia: koniec" +msgstr "Błąd nie do naprawienia: koniec" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" -msgstr "%s: Nazwa katalogu zosta³a zmieniona z %s" +msgstr "%s: Nazwa katalogu została zmieniona z %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" -msgstr "%s: Nazwa katalogu zosta³a zmieniona" +msgstr "%s: Nazwa katalogu została zmieniona" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Katalog jest nowy" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" -msgstr "B³êdny czas pliku" +msgstr "Błędny czas pliku" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" -msgstr "B³êdny czas modyfikacji (sekundy)" +msgstr "Błędny czas modyfikacji (sekundy)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" -msgstr "B³êdny czas modyfikacji (nanosekundy)" +msgstr "Błędny czas modyfikacji (nanosekundy)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" -msgstr "B³êdny numer urz±dzenia" +msgstr "Błędny numer urządzenia" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" -msgstr "B³êdny numer inodu" +msgstr "Błędny numer inodu" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" -msgstr "Za d³ugie pole w pliku migawkowym" +msgstr "Za długie pole w pliku migawkowym" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" -msgstr "B³±d czytania pliku migawkowego" +msgstr "Błąd czytania pliku migawkowego" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Nieoczekiwany EOF w pliku migawkowym" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" -msgstr "Nieoczekiwana warto¶æ pola w pliku migawkowym" +msgstr "Nieoczekiwana wartość pola w pliku migawkowym" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" -msgstr "Brakuj±ce zakoñczenie rekordu" +msgstr "Brakujące zakończenie rekordu" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" -msgstr "Z³y format pliku przyrostowego" +msgstr "Zły format pliku przyrostowego" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" -msgstr "Nie obs³ugiwana wersja formatu przyrostowego: %" +msgstr "Nie obsługiwana wersja formatu przyrostowego: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" -msgstr "Z³y format katalogu zrzutów: oczekiwano '%c', znaleziono %#3o" +msgstr "Zły format katalogu zrzutów: oczekiwano '%c', znaleziono %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" -msgstr "Z³y format katalogu zrzutów: powtórzone 'X'" +msgstr "Zły format katalogu zrzutów: powtórzone 'X'" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "Z³y format katalogu zrzutów: pusta nazwa w 'R'" +msgstr "Zły format katalogu zrzutów: pusta nazwa w 'R'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" -msgstr "Z³y format katalogu zrzutów: 'T' nie jest poprzedzone przez 'R'" +msgstr "Zły format katalogu zrzutów: 'T' nie jest poprzedzone przez 'R'" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "Z³y format katalogu zrzutów: pusta nazwa w 'T'" +msgstr "Zły format katalogu zrzutów: pusta nazwa w 'T'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" -msgstr "Z³y format katalogu zrzutów: oczekiwano '%c', znaleziono koniec danych" +msgstr "Zły format katalogu zrzutów: oczekiwano '%c', znaleziono koniec danych" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" -msgstr "Z³y format katalogu zrzutów: nigdy nie u¿yte 'X'" +msgstr "Zły format katalogu zrzutów: nigdy nie użyte 'X'" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" -msgstr "Nie mo¿na utworzyæ katalogu tymczasowego przy u¿yciu wzorca %s" +msgstr "Nie można utworzyć katalogu tymczasowego przy użyciu wzorca %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" -msgstr "%s: Bez skasowania katalogu: nie mo¿na odczytaæ stanu" +msgstr "%s: Bez skasowania katalogu: nie można odczytać stanu" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" -msgstr "%s: katalog na innym urz±dzeniu: bez skasowania" +msgstr "%s: katalog na innym urządzeniu: bez skasowania" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" -msgstr "%s: Usuniêcie %s\n" +msgstr "%s: Usunięcie %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" -msgstr "%s: Nie mo¿na usun±æ" +msgstr "%s: Nie można usunąć" #: src/list.c:113 #, c-format msgid "%s: Omitting" -msgstr "%s: Pominiêty" +msgstr "%s: Pominięty" #: src/list.c:131 #, c-format @@ -1150,52 +1165,52 @@ msgstr "blok %s: " #: 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" +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:726 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" -"Warto¶æ ósemkowa %.*s w archiwum jest spoza zakresu %s; bêdzie traktowana " -"jak uzupe³nienie dwójkowe" +"Wartość ósemkowa %.*s w archiwum jest spoza zakresu %s; będzie traktowana " +"jak uzupełnienie dwójkowe" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) #: 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" +msgstr "Wartość ósemkowa %.*s w archiwum jest spoza zakresu %s" #: src/list.c:758 msgid "Archive contains obsolescent base-64 headers" -msgstr "Archiwum zawiera przestarza³e nag³ówki base64" +msgstr "Archiwum zawiera przestarzałe nagłówki base64" #: 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" +msgstr "W archiwum jest łańcuch base64 %s spoza zakresu %s" #: 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" +msgstr "Wartość base256 w archiwum jest spoza zakresu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) #: 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" +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: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" +msgstr "Wartość %s w archiwum jest spoza zakresu %s %s..%s" #: src/list.c:1226 #, c-format msgid " link to %s\n" -msgstr " ³±cze do %s\n" +msgstr " łącze do %s\n" #: src/list.c:1234 #, c-format @@ -1205,17 +1220,17 @@ msgstr " nieznany typ pliku %s\n" #: src/list.c:1252 #, c-format msgid "--Long Link--\n" -msgstr "--D³ugie ³±cze--\n" +msgstr "--Długie łącze--\n" #: src/list.c:1256 #, c-format msgid "--Long Name--\n" -msgstr "--D³uga nazwa--\n" +msgstr "--Długa nazwa--\n" #: src/list.c:1260 #, c-format msgid "--Volume Header--\n" -msgstr "--Nag³ówek czê¶ci--\n" +msgstr "--Nagłówek części--\n" #: src/list.c:1268 #, c-format @@ -1234,7 +1249,7 @@ msgstr "Nazwa %s zmieniona na %s\n" #: src/misc.c:465 src/misc.c:483 #, c-format msgid "%s: Cannot rename to %s" -msgstr "%s: Nie mo¿na przemianowaæ na %s" +msgstr "%s: Nie można przemianować na %s" #: src/misc.c:488 #, c-format @@ -1243,11 +1258,11 @@ msgstr "Nazwa zmieniona z %s z powrotem na %s\n" #: src/misc.c:615 msgid "Cannot save working directory" -msgstr "Nie mo¿na zapisaæ bie¿±cego katalogu" +msgstr "Nie można zapisać bieżącego katalogu" #: src/misc.c:621 msgid "Cannot change working directory" -msgstr "Nie mo¿na zmieniæ katalogu" +msgstr "Nie można zmienić katalogu" #: src/misc.c:711 msgid "child process" @@ -1255,54 +1270,54 @@ msgstr "proces potomny" #: src/misc.c:720 msgid "interprocess channel" -msgstr "kana³ miêdzy procesami" +msgstr "kanał między procesami" #. TRANSLATORS: The following three msgids form a single sentence. #. #: 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ê" +msgstr "W nazwach plików użyto znaków dopasowania wzorców. Proszę" #: 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" +"użyć --wildcards aby włączyć porównywanie wzorców albo --no-wildcards żeby" #: src/names.c:597 msgid "suppress this warning." -msgstr "wy³±czyæ to ostrze¿enie" +msgstr "wyłączyć to ostrzeżenie" #: src/names.c:612 src/names.c:630 #, c-format msgid "%s: Not found in archive" -msgstr "%s: Nie znalaz³em w archiwum" +msgstr "%s: Nie znalazłem w archiwum" #: src/names.c:615 #, c-format msgid "%s: Required occurrence not found in archive" -msgstr "%s: Brak podanego wyst±pienia pliku w archiwum" +msgstr "%s: Brak podanego wystąpienia pliku w archiwum" #: src/tar.c:79 #, c-format msgid "Options `-%s' and `-%s' both want standard input" -msgstr "Opcje `-%s' i `-%s' obie chc± dostêpu do standardowego wej¶cia" +msgstr "Opcje `-%s' i `-%s' obie chcą dostępu do standardowego wejścia" #: src/tar.c:156 #, c-format msgid "%s: Invalid archive format" -msgstr "%s: B³êdny format archiwum" +msgstr "%s: Błędny format archiwum" #: src/tar.c:180 msgid "GNU features wanted on incompatible archive format" -msgstr "Próba u¿ycia rozszerzeñ GNU z niekompatybilnym formatem archiwum" +msgstr "Próba użycia rozszerzeń GNU z niekompatybilnym formatem archiwum" #: src/tar.c:241 #, c-format msgid "" "Unknown quoting style `%s'. Try `%s --quoting-style=help' to get a list." msgstr "" -"Nieznany styl cytowania `%s'. U¿yj `%s --quoting-style=help' ¿eby zobaczyæ " -"listê." +"Nieznany styl cytowania `%s'. Użyj `%s --quoting-style=help' żeby zobaczyć " +"listę." #: src/tar.c:336 msgid "" @@ -1314,14 +1329,14 @@ 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 "" -"`tar' GNU zapisuje wiele plików razem na na jednej ta¶mie lub archiwum " -"dyskowym i mo¿e odzyskaæ poszczególne pliki z archiwum.\n" +"`tar' GNU zapisuje wiele plików razem na na jednej taśmie lub archiwum " +"dyskowym i może odzyskać poszczególne pliki z archiwum.\n" "\n" -"Przyk³ady:\n" -" tar -cf archive.tar foo bar # utworzenie archive.tar z plików foo i bar.\n" -" tar -tvf archive.tar # wypisanie szczegó³owe plików w archive." +"Przykłady:\n" +" tar -cf archive.tar foo bar # utworzenie archive.tar z plików foo i bar.\n" +" tar -tvf archive.tar # wypisanie szczegółowe plików w archive." "tar.\n" -" tar -xf archive.tar # rozpakowanie plików z archive.tar.\n" +" tar -xf archive.tar # rozpakowanie plików z archive.tar.\n" #: src/tar.c:345 msgid "" @@ -1334,762 +1349,766 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"Przyrostek kopii zapasowej to `~', je¿eli nie zosta³ zmieniony przez --" +"Przyrostek kopii zapasowej to `~', jeżeli nie został zmieniony przez --" "suffix\n" -"lub SIMPLE_BACKUP_SUFFIX. Sposób zarz±dzania wersjami mo¿e byæ zmieniony " +"lub SIMPLE_BACKUP_SUFFIX. Sposób zarządzania wersjami może być zmieniony " "przez\n" -"--backup lub VERSION_CONTROL, mo¿liwe warto¶ci:\n" +"--backup lub VERSION_CONTROL, możliwe wartości:\n" "\n" " none, off bez kopii zapasowych\n" " t, numbered zrobienie numerowanych kopii zapasowych\n" -" nil, existing numerowane je¿eli takie ju¿ s±, w przeciwnym wypadku " +" nil, existing numerowane jeżeli takie już są, w przeciwnym wypadku " "proste\n" " never, simple proste kopie zapasowe\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" -msgstr "Podstawowe tryby dzia³ania:" +msgstr "Podstawowe tryby działania:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" -msgstr "wypisanie zawarto¶ci archiwum" +msgstr "wypisanie zawartości archiwum" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" -msgstr "rozpakowanie plików z archiwum" +msgstr "rozpakowanie plików z archiwum" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "utworzenie nowego archiwum" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" -msgstr "sprawdzenie ró¿nic miêdzy archiwum i plikami na dysku" +msgstr "sprawdzenie różnic między archiwum i plikami na dysku" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" -msgstr "do³±czenie plików na koñcu archiwum" +msgstr "dołączenie plików na końcu archiwum" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" -msgstr "do³±czenie tylko plików nowszych ni¿ kopie w archiwum" +msgstr "dołączenie tylko plików nowszych niż kopie w archiwum" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" -msgstr "do³±czenie plików tar do archiwum" +msgstr "dołączenie plików tar do archiwum" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" -msgstr "skasowanie plików z archiwum (nie na ta¶mie!)" +msgstr "skasowanie plików z archiwum (nie na taśmie!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" -msgstr "przetestowanie etykiety archiwum i wyj¶cie" +msgstr "przetestowanie etykiety archiwum i wyjście" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" -msgstr "Modyfikatory dzia³ania:" +msgstr "Modyfikatory działania:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" -msgstr "efektywne przetwarzanie plików rzadkich" +msgstr "efektywne przetwarzanie plików rzadkich" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" -msgstr "ustawienie wersji u¿ywanego formatu plików rzadkich (w³±cza --sparse)" +msgstr "ustawienie wersji używanego formatu plików rzadkich (włącza --sparse)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "backup przyrostowy w starym formacie GNU" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "PLIK" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "backup przyrostowy w nowym formacie GNU" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" -msgstr "bez zakoñczenia b³êdem je¿eli niedostêpne pliki" +msgstr "bez zakończenia błędem jeżeli niedostępne pliki" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "LICZBA" -#: src/tar.c:411 +#: src/tar.c:410 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 "" -"przetwarzanie tylko co LICZBA wyst±pienie ka¿dego pliku w archiwum. Opcja " -"dzia³a tylko razem z --delete, --diff, --extract albo --list oraz gdy lista " -"plików jest podana w linii poleceñ albo przez opcjê -T. LICZBA domy¶lnie " +"przetwarzanie tylko co LICZBA wystąpienie każdego pliku w archiwum. Opcja " +"działa tylko razem z --delete, --diff, --extract albo --list oraz gdy lista " +"plików jest podana w linii poleceń albo przez opcję -T. LICZBA domyślnie " "wynosi 1." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" -msgstr "archiwum o swobodnym dostêpie" +msgstr "archiwum o swobodnym dostępie" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" -msgstr "bez sprawdzania numerów urz±dzeñ przy tworzeniu archiwów przyrostowych" +msgstr "bez sprawdzania numerów urządzeń przy tworzeniu archiwów przyrostowych" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" -msgstr "ze sprawdzaniem numerów urz±dzeñ przy tworzeniu archiwów przyrostowych" +msgstr "ze sprawdzaniem numerów urządzeń przy tworzeniu archiwów przyrostowych" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Sterowanie zamazywaniem" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" -msgstr "próba weryfikacji archiwum po zapisaniu" +msgstr "próba weryfikacji archiwum po zapisaniu" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" -msgstr "usuniêcie plików po dodaniu do archiwum" +msgstr "usunięcie plików po dodaniu do archiwum" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" -msgstr "bez zamazania istniej±cych plików rozpakowanymi" +msgstr "bez zamazania istniejących plików rozpakowanymi" -#: src/tar.c:437 +#: src/tar.c:436 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 " +"bez zastępowania istniejących plików, które są nowsze niż ich kopie w " "archiwum" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" -msgstr "nadpisywanie istniej±cych plików" +msgstr "nadpisywanie istniejących plików" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" -msgstr "usuniêcie ka¿dego pliku przed zamazaniem go rozpakowanym plikiem" +msgstr "usunięcie każdego pliku przed zamazaniem go rozpakowanym plikiem" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" -msgstr "opró¿nianie starych katalogów przed rozpakowaniem kopii z archiwum" +msgstr "opróżnianie starych katalogów przed rozpakowaniem kopii z archiwum" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" -msgstr "zachowanie metadanych istniej±cych katalogów" +msgstr "zachowanie metadanych istniejących katalogów" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -"nadpisywanie metadanych istniej±cych katalogów przy rozpakowywaniu " +"nadpisywanie metadanych istniejących katalogów przy rozpakowywaniu " "(domyslnie)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" -msgstr "Wybór strumienia wyj¶ciowego" +msgstr "Wybór strumienia wyjściowego" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" -msgstr "rozpakowanie plików na standardowe wyj¶cie" +msgstr "rozpakowanie plików na standardowe wyjście" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "POLECENIE" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" -msgstr "przekazanie rozpakowywanych plików do innego programu" +msgstr "przekazanie rozpakowywanych plików do innego programu" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" -msgstr "zignorowanie kodów wyj¶cia procesów potomnych" +msgstr "zignorowanie kodów wyjścia procesów potomnych" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -"traktowanie niezerowych kodów wyj¶ciowych procesów potomnych jako b³êdu" +"traktowanie niezerowych kodów wyjściowych procesów potomnych jako błędu" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" -msgstr "Przetwarzanie atrybutów plików:" +msgstr "Przetwarzanie atrybutów plików:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" -msgstr "nadanie w³a¶ciciela NAZWA dodanym plikom" +msgstr "nadanie właściciela NAZWA dodanym plikom" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "nadanie grupy NAZWA dodanym plikom" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATA_ALBO_PLIK" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" -msgstr "ustawianie czasu modyfikacji dodanych plików z DATA_ALBO_PLIK" +msgstr "ustawianie czasu modyfikacji dodanych plików z DATA_ALBO_PLIK" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "ZMIANY" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" -msgstr "ZMIANA uprawnieñ dodanych plików (podanych symbolicznie)" +msgstr "ZMIANA uprawnień dodanych plików (podanych symbolicznie)" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METODA" -#: src/tar.c:479 +#: src/tar.c:478 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 "" -"zachowanie czasów dostêpu archiwizowanych plików przez ich odtworzenie po " -"czytaniu (METODA='replace'; domy¶lnie) albo przez nieustawianie czasu " +"zachowanie czasów dostępu archiwizowanych plików przez ich odtworzenie po " +"czytaniu (METODA='replace'; domyślnie) albo przez nieustawianie czasu " "(METODA='system')" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "bez odtworzenia czasu modyfikacji rozpakowanego pliku" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" -msgstr "staranie siê o odtworzenie w³a¶cicieli plików" +msgstr "staranie się o odtworzenie właścicieli plików" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" -msgstr "rozpakowanie plików jako w³asno¶ci rozpakowuj±cego" +msgstr "rozpakowanie plików jako własności rozpakowującego" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" -msgstr "u¿ywanie numerów, nie nazw u¿ytkowników/grup" +msgstr "używanie numerów, nie nazw użytkowników/grup" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -"odtworzenie informacji o uprawnieniach plików (domy¶lnie dla superusera)" +"odtworzenie informacji o uprawnieniach plików (domyślnie dla superusera)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -"u¿ycie umask u¿ytkownika przy odtwarzaniu uprawnieñ z archiwum (domy¶lnie " -"dla zwyk³ych u¿ytkowników)" +"użycie umask użytkownika przy odtwarzaniu uprawnień z archiwum (domyślnie " +"dla zwykłych użytkowników)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "pliki do rozpakowania posortowane jak w archiwum" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" -msgstr "to samo co równocze¶nie -p i -s" +msgstr "to samo co równocześnie -p i -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -"ustawianie czasów zmian i uprawnieñ odtworzonych katalogów opó¼nione do " -"koñca rozpakowywania" +"ustawianie czasów zmian i uprawnień odtworzonych katalogów opóźnione do " +"końca rozpakowywania" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" -msgstr "wy³±czenie efektu opcji --delay-directory-restore" +msgstr "wyłączenie efektu opcji --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" -msgstr "Wybór i prze³±czanie urz±dzeñ:" +msgstr "Wybór i przełączanie urządzeń:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIWUM" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" -msgstr "u¿ycie pliku lub urz±dzenia ARCHIWUM" +msgstr "użycie pliku lub urządzenia ARCHIWUM" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" -msgstr "plik archiwum lokalny, nawet je¿eli ma dwukropek" +msgstr "plik archiwum lokalny, nawet jeżeli ma dwukropek" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" -msgstr "u¿yj POLECENIA zamiast /etc/rmt" +msgstr "użyj POLECENIA zamiast /etc/rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" -msgstr "u¿yj POLECENIA zamiast rsh" +msgstr "użyj POLECENIA zamiast rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" -msgstr "podanie napêdu i gêsto¶ci" +msgstr "podanie napędu i gęstości" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" -msgstr "tworzenie/wypisanie/rozpakowanie archiwum wieloczê¶ciowego" +msgstr "tworzenie/wypisanie/rozpakowanie archiwum wieloczęściowego" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" -msgstr "zmiana ta¶my po zapisaniu LICZBA x 1024 bajtów" +msgstr "zmiana taśmy po zapisaniu LICZBA x 1024 bajtów" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" -msgstr "uruchomienie skryptu na koñcu ta¶my (w³±cza -M)" +msgstr "uruchomienie skryptu na końcu taśmy (włącza -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" -msgstr "u¿ycie/uaktualnienie numeru czê¶ci w PLIKU" +msgstr "użycie/uaktualnienie numeru części w PLIKU" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" -msgstr "Parametry bloków:" +msgstr "Parametry bloków:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOKI" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" -msgstr "BLOKI x 512 bajtów na rekord" +msgstr "BLOKI x 512 bajtów na rekord" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" -msgstr "LICZBA bajtów w rekordzie, wielokrotno¶æ 512" +msgstr "LICZBA bajtów w rekordzie, wielokrotność 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" -msgstr "ignorowanie wyzerowanych bloków w archiwum (oznacza EOF)" +msgstr "ignorowanie wyzerowanych bloków w archiwum (oznacza EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "podzielenie na bloki przy odczycie (dla pipe 4.2BSD)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" -msgstr "Wybór formatu archiwum:" +msgstr "Wybór formatu archiwum:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "utworzenie archiwum w danym formacie." -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" -msgstr "FORMAT mo¿e byæ jednym z nastêpuj±cych:" +msgstr "FORMAT może być jednym z następujących:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "stary format tara z V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "format GNU dla tara <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "format tara GNU 1.13" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "format POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "to samo co pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "to samo co --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "to samo co --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." -msgstr "s³owo_kluczowe[[:]=warto¶æ][,s³owo_kluczowe[[:]=warto¶æ]]..." +msgstr "słowo_kluczowe[[:]=wartość][,słowo_kluczowe[[:]=wartość]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" -msgstr "ustawianie s³ów kluczowych formatu pax" +msgstr "ustawianie słów kluczowych formatu pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -"utworzenie archiwum z nazw± wolumenu TEKST. Przy wypisywaniu/rozpakowaniu " -"TEKST bêdzie u¿yty jako wzorzec dopasowania dla nazwy" +"utworzenie archiwum z nazwą wolumenu TEKST. Przy wypisywaniu/rozpakowaniu " +"TEKST będzie użyty jako wzorzec dopasowania dla nazwy" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Opcje kompresji" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -"u¿ycie przyrostka nazwy archiwum dla wyznaczenie programu kompresuj±cego" +"użycie przyrostka nazwy archiwum do wyznaczenia programu kompresującego" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" +msgid "do not use archive suffix to determine the compression program" msgstr "" -"u¿ycie przyrostka nazwy archiwum dla wyznaczenie programu kompresuj±cego" +"bez używania przyrostka nazwy archiwum do wyznaczenia programu kompresującego" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "filtrowanie archiwum przez bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "filtrowanie archiwum przez gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "filtrowanie archiwum przez compress" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "filtrowanie archiwum przez lzma" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "filtrowanie archiwum przez gzip" +msgstr "filtrowanie archiwum przez lzop" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "filtrowanie archiwum przez gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" -msgstr "filtrowanie przez PROGRAM (akceptuj±cy -d)" +msgstr "filtrowanie przez PROGRAM (akceptujący -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" -msgstr "Wybór plików lokalnych:" +msgstr "Wybór plików lokalnych:" -#: src/tar.c:622 +#: src/tar.c:623 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)" +"dodanie podanego PLIKU do archiwum (przydatne jeżeli jego nazwa startuje od " +"myślnika)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "KATALOG" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" -msgstr "przej¶cie do KATALOGU" +msgstr "przejście do KATALOGU" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" -msgstr "nazwy plików do rozpakowania lub spakowania z PLIKU" +msgstr "nazwy plików do rozpakowania lub spakowania z PLIKU" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" -msgstr "-T czyta nazwy zakoñczone zerem, wy³±cz -C" +msgstr "-T czyta nazwy zakończone zerem, wyłącz -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "wyłączenie efektu użycia opcji --null" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -"usuniêcie znaków cytowania z nazw plików czytanych poprzez opcjê -T " -"(domy¶lnie)" +"usunięcie znaków cytowania z nazw plików czytanych poprzez opcję -T " +"(domyślnie)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" -msgstr "bez usuwania znaków cytowania z nazw plików czytanych poprzez opcjê -T" +msgstr "bez usuwania znaków cytowania z nazw plików czytanych poprzez opcję -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "WZORZEC" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" -msgstr "wykluczenie nazw pasuj±cych do WZORCA" +msgstr "wykluczenie nazw pasujących do WZORCA" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" -msgstr "wykluczenie nazw pasuj±cych do wzorców w PLIKU" +msgstr "wykluczenie nazw pasujących do wzorców w PLIKU" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -"wykluczenie katalogów zawieraj±cych znacznik pamiêci podrêcznej CACHEDIR." -"TAG, oprócz samych plików znacznika" +"wykluczenie katalogów zawierających znacznik pamięci podręcznej CACHEDIR." +"TAG, oprócz samych plików znacznika" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "wykluczenie katalogów zawieraj±cych CACHEDIR.TAG i ich podkatalogów" +msgstr "wykluczenie katalogów zawierających CACHEDIR.TAG i ich podkatalogów" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" -msgstr "wykluczenie katalogów zawieraj±cych CACHEDIR.TAG" +msgstr "wykluczenie katalogów zawierających CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" -msgstr "wykluczenie katalogów zawieraj±cych PLIK, ale nie samego PLIKU" +msgstr "wykluczenie katalogów zawierających PLIK, ale nie samego PLIKU" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" -msgstr "wykluczenie katalogów zawieraj±cych PLIK i ich podkatalogów" +msgstr "wykluczenie katalogów zawierających PLIK i ich podkatalogów" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" -msgstr "wykluczenie katalogów zawieraj±cych PLIK" +msgstr "wykluczenie katalogów zawierających PLIK" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" -msgstr "wykluczenie katalogów systemu administrowania wersjami" +msgstr "wykluczenie katalogów systemu administrowania wersjami" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" -msgstr "bez automatycznego zag³êbiania siê w katalogi" +msgstr "bez automatycznego zagłębiania się w katalogi" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" -msgstr "pozostanie w jednym systemie plików" +msgstr "pozostanie w jednym systemie plików" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" -msgstr "zag³êbianie siê w podkatalogi (domy¶lnie)" +msgstr "zagłębianie się w podkatalogi (domyślnie)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" -msgstr "bez usuwania pocz±tkowego `/' z nazw plików" +msgstr "bez usuwania początkowego `/' z nazw plików" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" -msgstr "archiwizacja plików, na które wskazuj± ³±cza symboliczne" +msgstr "archiwizacja plików, na które wskazują łącza symboliczne" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" -msgstr "archiwizacja plików, na które wskazuj± ³±cza zwyk³e" +msgstr "archiwizacja plików, na które wskazują łącza zwykłe" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "NAZWA-PLIKU" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" -msgstr "zaczêcie od pliku NAZWA-PLIKU w archiwum" +msgstr "zaczęcie od pliku NAZWA-PLIKU w archiwum" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" -msgstr "zapisanie tylko plików nowszych ni¿ DATA albo data PLIKU" +msgstr "zapisanie tylko plików nowszych niż DATA albo data PLIKU" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATA" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" -msgstr "porównywanie daty i czasu tylko dla zmienionych danych" +msgstr "porównywanie daty i czasu tylko dla zmienionych danych" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "TRYB" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" -msgstr "kopia zapasowa przed usuniêciem, wybranie TRYBU zarz±dzania wersjami" +msgstr "kopia zapasowa przed usunięciem, wybranie TRYBU zarządzania wersjami" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "NAPIS" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -"kopia zapasowa przed usuniêciem, zmiana domy¶lnego przyrostka ('~', je¿eli " -"nie zmieniony przez zmienn± ¶rodowiska SIMPLE_BACKUP_SUFFIX)" +"kopia zapasowa przed usunięciem, zmiana domyślnego przyrostka ('~', jeżeli " +"nie zmieniony przez zmienną środowiska SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" -msgstr "Zmiany nazwy plików:" +msgstr "Zmiany nazwy plików:" -#: src/tar.c:685 +#: src/tar.c:686 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" +"ucięcie przed rozpakowaniem LICZBY początkowych elementów ścieżki z nazw " +"plików" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" -msgstr "WYRA¯ENIE" +msgstr "WYRAÅ»ENIE" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" -msgstr "u¿ycie WYRA¯ENIA zamiany sed-a do przekszta³cenia nazw plików" +msgstr "użycie WYRAÅ»ENIA zamiany sed-a do przekształcenia nazw plików" -#: src/tar.c:694 +#: src/tar.c:695 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):" +"Opcje filtracji nazw plików (dotyczą zarówno wzorców wykluczania jak " +"włączania):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" -msgstr "traktowanie tak samo ma³ych i wielkich liter" +msgstr "traktowanie tak samo małych i wielkich liter" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" -msgstr "nazwy porównywane od pocz±tków nazw plików" +msgstr "nazwy porównywane od początków nazw plików" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" -msgstr "wzorce odnosz± siê do nazw po ka¿dym / (domy¶lnie)" +msgstr "wzorce odnoszą się do nazw po każdym / (domyślnie)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" -msgstr "odró¿nianie ma³ych i wielkich liter (domy¶lnie)" +msgstr "odróżnianie małych i wielkich liter (domyślnie)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" -msgstr "u¿ywanie wildcards (domy¶lnie dla wykluczania)" +msgstr "używanie wildcards (domyślnie dla wykluczania)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" -msgstr "dos³owne porównywanie napisów" +msgstr "dosłowne porównywanie napisów" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" -msgstr "wildcards nie s± porównywane z `/'" +msgstr "wildcards nie są porównywane z `/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" -msgstr "wildcards s± porównywane z '/' (domy¶lnie dla wykluczania)" +msgstr "wildcards są porównywane z '/' (domyślnie dla wykluczania)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Informacje:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" -msgstr "wypisywanie szczegó³ów o przetwarzanych plikach" +msgstr "wypisywanie szczegółów o przetwarzanych plikach" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -"wypisywanie co ILE rekordów informacji o przetwarzaniu (domyslnie co 10)" +"wypisywanie co ILE rekordów informacji o przetwarzaniu (domyslnie co 10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "AKCJA" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" -msgstr "wykonanie AKCJI przy ka¿dym punkcie kontrolnym" +msgstr "wykonanie AKCJI przy każdym punkcie kontrolnym" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" -msgstr "wypisanie komunikatu je¿eli nie wszytkie ³±cza zosta³y zapisane" +msgstr "wypisanie komunikatu jeżeli nie wszytkie łącza zostały zapisane" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" -msgstr "SYGNA£" +msgstr "SYGNAŁ" -#: src/tar.c:729 +#: src/tar.c:730 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 "" -"wypisanie ca³kowitej liczby bajtów po przetworzeniu archiwum; z argumentem - " -"wypisanie ca³kowitej liczby bajtów kiedy zostanie wys³any SYGNA£; Dozwolone " -"sygna³y: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2; nazwy bez prefiksu SIG " -"s± te¿ akceptowane" +"wypisanie całkowitej liczby bajtów po przetworzeniu archiwum; z argumentem - " +"wypisanie całkowitej liczby bajtów kiedy zostanie wysłany SYGNAŁ; Dozwolone " +"sygnały: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2; nazwy bez prefiksu SIG " +"są też akceptowane" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" -msgstr "wypisanie dat modyfikacji plików w UTC" +msgstr "wypisanie dat modyfikacji plików w UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" -msgstr "zapisanie dok³adnych informacji w PLIKU" +msgstr "zapisanie dokładnych informacji w PLIKU" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" -msgstr "pokazanie przy ka¿dym komunikacie numeru bloku w archiwum" +msgstr "pokazanie przy każdym komunikacie numeru bloku w archiwum" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" -msgstr "proszenie o potwierdzenie ka¿dego dzia³ania" +msgstr "proszenie o potwierdzenie każdego działania" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" -msgstr "wypisanie domy¶lnych ustawieñ tar-a" +msgstr "wypisanie domyślnych ustawień tar-a" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -"wypisywanie ka¿dego katalogu nie pasuj±cego do kryteriów szukania przy " +"wypisywanie każdego katalogu nie pasującego do kryteriów szukania przy " "wypisywaniu albo rozpakowywaniu archiwum" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" -msgstr "pokazanie nazw plików albo archiwów po przeszkta³ceniu" +msgstr "pokazanie nazw plików albo archiwów po przeszktałceniu" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STYL" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -"ustawienie stylu ujmowania nazw w cudzys³owy; poni¿ej dozwolone warto¶ci " +"ustawienie stylu ujmowania nazw w cudzysłowy; poniżej dozwolone wartości " "STYLU" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" -msgstr "dodatkowe ujmowanie w znaki cytowania znaków z £AÑCUCHA" +msgstr "dodatkowe ujmowanie w znaki cytowania znaków z ŁAŃCUCHA" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" -msgstr "wy³±czenie ujmowania w znaki cytowania znaków z £AÑCUCHA" +msgstr "wyłączenie ujmowania w znaki cytowania znaków z ŁAŃCUCHA" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" -msgstr "Opcje kompatybilno¶ci:" +msgstr "Opcje kompatybilności:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2097,315 +2116,313 @@ msgstr "" "przy tworzeniu: to samo co --old-archive przy odtwarzaniu: to co --no-same-" "owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Inne opcje:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" -msgstr "wy³±czenie u¿ywania potencjalnie szkodliwych opcji" +msgstr "wyłączenie używania potencjalnie szkodliwych opcji" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" -msgstr "Nie mo¿na podaæ wiêcej ni¿ jednej opcji z `-Acdtrux'" +msgstr "Nie można podać więcej niż jednej opcji z `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Niezgodne opcje kompresji" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" -msgstr "Nieznana nazwa sygna³u: %s" +msgstr "Nieznana nazwa sygnału: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" -msgstr "Nie znaleziono pliku z dat±" +msgstr "Nie znaleziono pliku z datą" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Postawienie %s w miejscu nieznanego formatu daty %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Opcja %s: Potraktowanie daty `%s' jako %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" -msgstr "%s: lista plików ju¿ przeczytana" +msgstr "%s: lista plików już przeczytana" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: przeczytana nazwa pliku zawiera znak NUL" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Argumenty opcji --quoting-style:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" "\n" -"*Ten* tar ma domy¶lne parametry:\n" +"*Ten* tar ma domyślne parametry:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" -msgstr "B³êdny wspó³czynnik ³±czenia w bloki" +msgstr "Błędny współczynnik łączenia w bloki" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" -msgstr "B³êdna d³ugo¶æ ta¶my" +msgstr "Błędna długość taśmy" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" -msgstr "Wiêcej ni¿ jedna data graniczna" +msgstr "Więcej niż jedna data graniczna" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" -msgstr "B³êdna warto¶æ wersji plików rzadkich" +msgstr "Błędna wartość wersji plików rzadkich" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" -msgstr "ten system nie pozwala na u¿ycie --atime-preserve='system'" +msgstr "ten system nie pozwala na użycie --atime-preserve='system'" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" -msgstr "warto¶æ --checkpoint nie jest liczb± ca³kowit±" +msgstr "wartość --checkpoint nie jest liczbą całkowitą" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" -msgstr "%s: b³êdna grupa" +msgstr "%s: błędna grupa" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" -msgstr "B³êdne uprawnienia podane w opcji" +msgstr "Błędne uprawnienia podane w opcji" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" -msgstr "B³êdny numer" +msgstr "Błędny numer" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" -msgstr "B³êdny w³a¶ciciel" +msgstr "Błędny właściciel" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"Opcja --preserve jest przestarzała, zamiast niej użyj --preserve-permissions " +"--preserve-order" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" -msgstr "B³êdna wielko¶æ rekordu" +msgstr "Błędna wielkość rekordu" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." -msgstr "Rozmiar rekordu musi byæ wielokrotno¶ci± %d" +msgstr "Rozmiar rekordu musi być wielokrotnością %d" -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" -msgstr "B³êdna ilo¶æ elementów" +msgstr "Błędna ilość elementów" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" -msgstr "Wolno u¿yæ tylko jednej opcji polecenia --to-command" +msgstr "Wolno użyć tylko jednej opcji polecenia --to-command" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" -msgstr "B³êdna specyfikacja gêsto¶ci: %s" +msgstr "Błędna specyfikacja gęstości: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" -msgstr "Nieznana gêsto¶æ: `%c'" +msgstr "Nieznana gęstość: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" -msgstr "Opcje `-[0-7][lmh]' nie s± u¿ywane w *tym* tarze" +msgstr "Opcje `-[0-7][lmh]' nie są używane w *tym* tarze" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[PLIK]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Stara opcja `%c' wymaga argumentu." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" -msgstr "--occurrence nie ma znaczenia bez listy plików" +msgstr "--occurrence nie ma znaczenia bez listy plików" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" -msgstr "--occurrence nie mo¿e byæ u¿yte w tym trybie" +msgstr "--occurrence nie może być użyte w tym trybie" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" -msgstr "Archiwum sk³adaj±ce siê z wielu plików wymaga opcji `-M'" +msgstr "Archiwum składające się z wielu plików wymaga opcji `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" -msgstr "Nie mo¿na po³±czyæ --listed-incremental z --newer" +msgstr "Nie można połączyć --listed-incremental z --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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: Za d³uga etykieta czê¶ci (mo¿e mieæ do %lu bajtu)" -msgstr[1] "%s: Za d³uga etykieta czê¶ci (mo¿e mieæ do %lu bajtów)" -msgstr[2] "%s: Za d³uga etykieta czê¶ci (mo¿e mieæ do %lu bajtów)" +msgstr[0] "%s: Za długa etykieta części (może mieć do %lu bajtu)" +msgstr[1] "%s: Za długa etykieta części (może mieć do %lu bajtów)" +msgstr[2] "%s: Za długa etykieta części (może mieć do %lu bajtów)" -#: src/tar.c:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" -msgstr "Nie mo¿na zweryfikowaæ archiwum wieloczê¶ciowego" +msgstr "Nie można zweryfikować archiwum wieloczęściowego" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" -msgstr "Nie mo¿na zweryfikowaæ archiwum skompresowanego" +msgstr "Nie można zweryfikować archiwum skompresowanego" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" -msgstr "Nie mo¿na u¿ywaæ wieloczê¶ciowego archiwum skompresowanego" +msgstr "Nie można używać wieloczęściowego archiwum skompresowanego" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" -msgstr "Nie mo¿na po³±czyæ skompresowanych archiwów" +msgstr "Nie można połączyć skompresowanych archiwów" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" -msgstr "--pax-option mo¿e byæ u¿yta tylko przy archiwach POSIX-owych" +msgstr "--pax-option może być użyta tylko przy archiwach POSIX-owych" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "Długość części nie może być mniejsza od wielkości rekordu" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "opcja --preserve-order nie może być używana z --listed-incremental" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" -msgstr "Tchórzliwie odmawiam utworzenia pustego archiwum" +msgstr "Tchórzliwie odmawiam utworzenia pustego archiwum" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" -msgstr "Opcje `-Aru' s± niekompatybilne z `-f -'" +msgstr "Opcje `-Aru' są niekompatybilne z `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" -msgstr "Musisz podaæ jedn± z opcji `-Acdtrux'" +msgstr "Musisz podać jedną z opcji `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Zakończenie w stanie błędu z powodu uprzednich błędów" #: src/update.c:86 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" -msgstr[0] "%s: Plik skurczy³ siê o %s bajt" -msgstr[1] "%s: Plik skurczy³ siê o %s bajty" -msgstr[2] "%s: Plik skurczy³ siê o %s bajtów" +msgstr[0] "%s: Plik skurczył się o %s bajt" +msgstr[1] "%s: Plik skurczył się o %s bajty" +msgstr[2] "%s: Plik skurczył się o %s bajtów" #: src/xheader.c:156 #, c-format msgid "Keyword %s is unknown or not yet implemented" -msgstr "S³owo kluczowe %s jest nieznane albo jeszcze nie zaimplementowane" +msgstr "Słowo kluczowe %s jest nieznane albo jeszcze nie zaimplementowane" #: src/xheader.c:182 #, c-format msgid "Pattern %s cannot be used" -msgstr "Nie mo¿e byæ u¿yty wzorzec %s" +msgstr "Nie może być użyty wzorzec %s" #: src/xheader.c:192 #, c-format msgid "Keyword %s cannot be overridden" -msgstr "S³owo kluczowe %s nie mo¿e byæ zast±pione" +msgstr "Słowo kluczowe %s nie może być zastąpione" #: src/xheader.c:496 msgid "Malformed extended header: missing length" -msgstr "B³êdny nag³ówek rozszerzony: brakuje d³ugo¶ci" +msgstr "Błędny nagłówek rozszerzony: brakuje długości" #: src/xheader.c:504 msgid "Extended header length is out of allowed range" -msgstr "D³ugo¶æ nag³ówka rozszerzonego jest poza dozwolonym zakresem" +msgstr "Długość nagłówka rozszerzonego jest poza dozwolonym zakresem" #: 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" +msgstr "Długośc nagłówka rozszerzonego %*s jest poza zakresem" #: 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" +msgstr "Błędny nagłówek rozszerzony: brakuje odstępu po długości" #: src/xheader.c:531 msgid "Malformed extended header: missing equal sign" -msgstr "B³êdny nag³ówek rozszerzony: brakuje znaku równo¶ci" +msgstr "Błędny nagłówek rozszerzony: brakuje znaku równości" #: src/xheader.c:537 msgid "Malformed extended header: missing newline" -msgstr "B³êdny nag³ówek rozszerzony: brakuje znaku mowej linii" +msgstr "Błędny nagłówek rozszerzony: brakuje znaku mowej linii" #: src/xheader.c:574 #, c-format msgid "Ignoring unknown extended header keyword `%s'" -msgstr "Zignorowane nieznane s³owo kluczowe nag³ówka rozszerzonego `%s'" +msgstr "Zignorowane nieznane słowo kluczowe nagłówka rozszerzonego `%s'" #: src/xheader.c:778 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" -"Wygenerowana para s³owo kluczowe/warto¶æ jest za d³uga (s³owo kluczowe=%s, " -"d³ugo¶æ=%s)" +"Wygenerowana para słowo kluczowe/wartość jest za długa (słowo kluczowe=%s, " +"długość=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). #: 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" +msgstr "Nagłówek rozszerzony - %s=%s jest poza zakresem %s..%s" #: 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" +msgstr "Błędny nagłówek rozszerzony: błędny %s=%s" #: 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" +msgstr "Błędny nagłówek rozszerzony: nadmiarowe %s=%s" #: 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" +msgstr "Błędny nagłówek rozszerzony: błędny %s: niespodziewany ogranicznik %c" #: 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" +msgstr "Błędny nagłówek rozszerzony: błędny %s: nieparzysta liczba wartości" #: src/checkpoint.c:107 #, c-format msgid "%s: not a valid timeout" -msgstr "%s: b³êdna specyfikacja ograniczenia czasu" +msgstr "%s: błędna specyfikacja ograniczenia czasu" #: src/checkpoint.c:112 #, c-format @@ -2443,12 +2460,12 @@ msgid "" "genfile manipulates data files for GNU paxutils test suite.\n" "OPTIONS are:\n" msgstr "" -"genfile s³u¿y do operacji na plikach w ramach zestawu testów GNU paxutils.\n" +"genfile służy do operacji na plikach w ramach zestawu testów GNU paxutils.\n" "OPCJE:\n" #: tests/genfile.c:126 msgid "File creation options:" -msgstr "Opcje tworzenia plików:" +msgstr "Opcje tworzenia plików:" #: tests/genfile.c:127 tests/genfile.c:138 msgid "SIZE" @@ -2460,19 +2477,19 @@ msgstr "Utworzenie pliku o podanym ROZMIARZE" #: tests/genfile.c:130 msgid "Write to file NAME, instead of standard output" -msgstr "Pisanie na pliku NAZWA zamiast na standardowe wyj¶cie" +msgstr "Pisanie na pliku NAZWA zamiast na standardowe wyjście" #: tests/genfile.c:132 msgid "Read file names from FILE" -msgstr "Czytanie nazw plików z PLIKU" +msgstr "Czytanie nazw plików z PLIKU" #: tests/genfile.c:134 msgid "-T reads null-terminated names" -msgstr "-T czyta nazwy zakoñczone zerem" +msgstr "-T czyta nazwy zakończone zerem" #: tests/genfile.c:136 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" -msgstr "Wype³nienie pliku podanym WZORCEM. WZORZEC to 'default' albo 'zeros'" +msgstr "Wypełnienie pliku podanym WZORCEM. WZORZEC to 'default' albo 'zeros'" #: tests/genfile.c:139 msgid "Size of a block for sparse file" @@ -2480,7 +2497,7 @@ msgstr "Rozmiar bloku pliku rzadkiego" #: tests/genfile.c:141 msgid "Generate sparse file. Rest of the command line gives the file map." -msgstr "Utworzenie pliku rzadkiego. Reszta argumentów okre¶la mapê pliku." +msgstr "Utworzenie pliku rzadkiego. Reszta argumentów określa mapę pliku." #: tests/genfile.c:143 msgid "OFFSET" @@ -2492,17 +2509,17 @@ msgstr "Ustawienie pozycji zapisu przez zapisem danych" #: tests/genfile.c:150 msgid "File statistics options:" -msgstr "Opcje statystyki plików" +msgstr "Opcje statystyki plików" #: tests/genfile.c:153 msgid "Print contents of struct stat for each given file. Default FORMAT is: " msgstr "" -"Wypisanie zawarto¶ci struct stat dla ka¿dego podanego pliku. Domy¶lny " +"Wypisanie zawartości struct stat dla każdego podanego pliku. Domyślny " "FORMAT: " #: tests/genfile.c:160 msgid "Synchronous execution options:" -msgstr "Opcje równoczesnego wykonywania:" +msgstr "Opcje równoczesnego wykonywania:" #: tests/genfile.c:163 msgid "" @@ -2515,41 +2532,41 @@ msgstr "" #: tests/genfile.c:166 msgid "Perform given action (see below) upon reaching checkpoint NUMBER" msgstr "" -"Wykonanie podanej akcji (zobacz ni¿ej) po napotkaniu punktu kontrolnego NUMER" +"Wykonanie podanej akcji (zobacz niżej) po napotkaniu punktu kontrolnego NUMER" #: tests/genfile.c:169 msgid "Set date for next --touch option" -msgstr "Ustaw datê nastêpnej opcji --touch" +msgstr "Ustaw datę następnej opcji --touch" #: tests/genfile.c:172 msgid "Display executed checkpoints and exit status of COMMAND" -msgstr "Wypisanie wykonanych punktów kontrolnych i kodu wyj¶cia POLECENIA" +msgstr "Wypisanie wykonanych punktów kontrolnych i kodu wyjścia POLECENIA" #: tests/genfile.c:177 msgid "" "Synchronous execution actions. These are executed when checkpoint number " "given by --checkpoint option is reached." msgstr "" -"Akcje równoczesnego wykonania. S± podejmowane po osi±gniêciu punktu " -"kontrolnego o numerze podanym przez opcjê --checkpoint" +"Akcje równoczesnego wykonania. Są podejmowane po osiągnięciu punktu " +"kontrolnego o numerze podanym przez opcję --checkpoint" #: tests/genfile.c:180 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" msgstr "" -"Obciêcie PLIKU do rozmiaru podanego przez poprzednia opcjê --length (albo 0, " -"je¿eli nie zosta³ podany)" +"Obcięcie PLIKU do rozmiaru podanego przez poprzednia opcję --length (albo 0, " +"jeżeli nie został podany)" #: tests/genfile.c:184 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." msgstr "" -"Dodanie ROZMIAR bajtów do PLIKU. ROZMIAR jak podany przez poprzedni± opcjê --" +"Dodanie ROZMIAR bajtów do PLIKU. ROZMIAR jak podany przez poprzednią opcję --" "length." #: tests/genfile.c:187 msgid "Update the access and modification times of FILE" -msgstr "Uaktualnienie czasów dostepu i modyfikacji PLIKU" +msgstr "Uaktualnienie czasów dostepu i modyfikacji PLIKU" #: tests/genfile.c:190 msgid "Execute COMMAND" @@ -2558,7 +2575,7 @@ msgstr "Wykonanie POLECENIA" #: tests/genfile.c:240 #, c-format msgid "Invalid size: %s" -msgstr "B³êdny rozmiar: %s" +msgstr "Błędny rozmiar: %s" #: tests/genfile.c:245 #, c-format @@ -2573,22 +2590,22 @@ msgstr "Ujemny rozmiar: %s" #: tests/genfile.c:261 tests/genfile.c:558 #, c-format msgid "stat(%s) failed" -msgstr "b³±d stat(%s)" +msgstr "błąd stat(%s)" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "żądana długość pliku %lu, faktyczna %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "utworzony plik nie jest rzadki" #: tests/genfile.c:353 #, c-format msgid "Error parsing number near `%s'" -msgstr "B³±d przetwarzania liczby blisko `%s'" +msgstr "Błąd przetwarzania liczby blisko `%s'" #: tests/genfile.c:359 #, c-format @@ -2603,11 +2620,11 @@ msgstr "[ARGUMENTY...]" #: tests/genfile.c:662 tests/genfile.c:676 #, c-format msgid "cannot open `%s'" -msgstr "nie mo¿na otworzyæ `%s'" +msgstr "nie można otworzyć `%s'" #: tests/genfile.c:425 msgid "cannot seek" -msgstr "nie mo¿na ustawiæ pozycji" +msgstr "nie można ustawić pozycji" #: tests/genfile.c:442 #, c-format @@ -2618,12 +2635,12 @@ msgstr "nazwa pliku zawiera znak NUL" #, 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" +"nie można utworzyć pliku rzadkiego na standardowym wyjściu, użyj opcji --file" #: tests/genfile.c:585 #, c-format msgid "incorrect mask (near `%s')" -msgstr "nieprawid³owa maska (ko³o `%s')" +msgstr "nieprawidłowa maska (koło `%s')" #: tests/genfile.c:591 tests/genfile.c:624 #, c-format @@ -2633,37 +2650,37 @@ msgstr " Nieznane pole `%s'" #: tests/genfile.c:651 #, c-format msgid "cannot set time on `%s'" -msgstr "nie mo¿na ustawiæ czasu na `%s'" +msgstr "nie można ustawić czasu na `%s'" #: tests/genfile.c:805 #, c-format msgid "Command exited successfully\n" -msgstr "Polecenie zakoñczy³o siê poprawnie\n" +msgstr "Polecenie zakończyło się poprawnie\n" #: tests/genfile.c:807 #, c-format msgid "Command failed with status %d\n" -msgstr "Polecenie zakoñczy³o siê niepoprawnie z kodem %d\n" +msgstr "Polecenie zakończyło się niepoprawnie z kodem %d\n" #: tests/genfile.c:811 #, c-format msgid "Command terminated on signal %d\n" -msgstr "Polecenie zosta³o zakoñczone sygna³em %d\n" +msgstr "Polecenie zostało zakończone sygnałem %d\n" #: tests/genfile.c:813 #, c-format msgid "Command stopped on signal %d\n" -msgstr "Polecenie zosta³o zatrzymane sygna³em %d\n" +msgstr "Polecenie zostało zatrzymane sygnałem %d\n" #: tests/genfile.c:816 #, c-format msgid "Command dumped core\n" -msgstr "Zosta³ zapisany obraz pamiêci (core dump) polecenia\n" +msgstr "Został zapisany obraz pamięci (core dump) polecenia\n" #: tests/genfile.c:819 #, c-format msgid "Command terminated\n" -msgstr "Polecenie zakoñczone\n" +msgstr "Polecenie zakończone\n" #: tests/genfile.c:851 #, c-format @@ -2673,11 +2690,7 @@ msgstr "--stat wymaga podania nazwy pliku" #: 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" +msgstr "za dużo argumentów" -#~ msgid "Error exit delayed from previous errors" -#~ msgstr "Zakoñczenie z b³êdem z powodu uprzednich b³êdów" +#~ 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?" diff --git a/po/pt.gmo b/po/pt.gmo index ea3e840..9fd5232 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index f2b0b99..5212a15 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -113,11 +113,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -323,11 +323,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "" @@ -382,7 +382,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -479,6 +479,26 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -510,13 +530,6 @@ msgid "" " --help Output this help.\n" msgstr "" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "" @@ -541,107 +554,107 @@ msgstr "Fim-de-ficheiro prematuro" msgid "Garbage command" msgstr "Comando desconhecido" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 #, fuzzy msgid "Total bytes read" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Valor inválido para tamanho de registo (record_size)" -#: src/buffer.c:478 +#: src/buffer.c:480 #, fuzzy msgid "No archive name given" msgstr "Não deram nome de arquivo, que fazer?" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Não se pode de verificar arquivos stdin ou stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 #, fuzzy msgid "Cannot update compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "No princípio da fita, pára-se imediatamente" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Erros de mais: termina-se" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 #, 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ATENÇÃO: O arquivo está incompleto" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -653,71 +666,71 @@ msgstr "" " ! Criar uma \"sub-shell\" (interpretador de comandos)\n" " ? Escrever esta lista\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Não há novo volume; termina-se. \n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s não tem continuidade neste volume" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, 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:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora da sequência" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, 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:1304 +#: src/buffer.c:1306 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "O volume não condiz! %s!=%s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "" @@ -735,7 +748,7 @@ msgstr[1] "%s: S msgid "Contents differ" msgstr "Tempo de modificação" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Fim de ficheiro inesperado no arquivo" @@ -862,7 +875,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 #, fuzzy msgid "contents not dumped" msgstr " (imagem da memória despejada \"core dumped\")" @@ -892,7 +905,7 @@ msgstr "%s msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -992,125 +1005,125 @@ msgstr "N msgid "Error is not recoverable: exiting now" msgstr "" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "Mudou-se o nome do directoria %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, fuzzy, c-format msgid "%s: Directory has been renamed" msgstr "Mudou-se o nome do directoria %s" -#: src/incremen.c:502 +#: src/incremen.c:505 #, fuzzy, c-format msgid "%s: Directory is new" msgstr "O directoria %s é novo" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 #, fuzzy msgid "Read error in snapshot file" msgstr "Erro de leitura sobre %s" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 #, fuzzy msgid "Unexpected field value in snapshot file" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Não se pode mudar para a directoria %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Apaga-se %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Não se consegue apagar %s" @@ -1314,87 +1327,87 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Fim de ficheiro inesperado no arquivo" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1402,569 +1415,575 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 #, 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:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Não se pode verificar arquivos multi-volume" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Arquivo para stdin" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Há conflitos entre as opções de compressão" -#: src/tar.c:596 +#: src/tar.c:595 #, 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:598 -msgid "do not use use archive suffix to determine the compression program" -msgstr "" +#: src/tar.c:597 +#, fuzzy +msgid "do not use archive suffix to determine the compression program" +msgstr "Não se consegue escrever para o programa de compressão" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s é o arquivo; não será arquivado" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s é o arquivo; não será arquivado" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Não se pode mudar para a directoria %s" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Retira-se \"/\" das ligações (\"links\") absolutas " -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1972,279 +1991,275 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 #, fuzzy msgid "ask for confirmation for every action" msgstr "Não se consegue obter confirmação, do utilizador" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Há conflitos entre as opções de compressão" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "Opção \"%c\" desconhecida" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1369 -msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" -msgstr "" - -#: src/tar.c:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 #, fuzzy msgid "Invalid record size" msgstr "Valor inválido para tamanho de registo (record_size)" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1893 +#: src/tar.c:1892 #, fuzzy msgid "Only one --to-command option allowed" msgstr "Só se permite uma opção de compressão" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Opção \"%c\" desconhecida" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "A antiga opção `%c' exige um argumento." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Para usar vários arquivos é necessária a opção \"-M\"" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Não se pode verificar arquivos multi-volume" -#: src/tar.c:2308 +#: src/tar.c:2307 #, fuzzy msgid "Cannot verify compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Não se pode de usar arquivos multi-volume comprimidos" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Recusa-se, covardemente, a criar um arquivo vazio" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "As opções \"-Aru\" são imcompatíveis com \"-f -\"" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Tem que se especificar uma das opções \"-Acdtrux\"" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index d0c749f..58505cd 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index 63fca5a..3e2b6c9 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -118,11 +118,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -320,11 +320,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -379,7 +379,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -476,6 +476,29 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Informar erros no programa para .\n" +"Informar erros na tradução para .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -512,16 +535,6 @@ msgstr "" " --version Mostra informações de versão.\n" " --help Mostra esta ajuda.\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Informar erros no programa para .\n" -"Informar erros na tradução para .\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -547,104 +560,104 @@ msgstr "Fim de arquivo prematuro" msgid "Garbage command" msgstr "Comando sem sentido" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Total de bytes escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Total de bytes escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Valor inválido para \"record_size\"" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Nome de arquivo-tar não informado" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "" "Impossível verificar arquivos-tar de entrada/saída padrão (stdin/stdout)" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Impossível atualizar arquivos-tar compactados" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "No princípio da fita, encerrando agora" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Muitos erros, encerrando" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contém um número de volume inválido" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Sobrecarga de número de volumes" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare o volume #%d para %s e tecle Enter: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Fim-de-arquivo onde era esperado resposta do usuário" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "AVISO: O arquivo-tar está incompleto" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -656,71 +669,71 @@ msgstr "" " ! Criar um \"sub-shell\"\n" " ? Mostra esta lista\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Nenhum volume novo; encerrando.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "comando `%s' falhou" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s não continua neste volume" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s é o tamanho errado (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora de sequência" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "O arquivo-tar não rotulado para casar com %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "O volume %s não casa com %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -735,7 +748,7 @@ msgstr[1] "S msgid "Contents differ" msgstr "O conteúdo é diferente" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Final-de-arquivo inesperado no arquivo-tar" @@ -854,7 +867,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -883,7 +896,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -978,124 +991,124 @@ msgstr "%s: Imposs msgid "Error is not recoverable: exiting now" msgstr "Erro não é recuperável: saindo agora" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Diretório foi renomeado" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Diretório foi renomeado" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: O diretório é novo" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Carimbo de horário inválido" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Modo inválido informado na opção" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Número de dispositivo inválido" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Número de inode inválido" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Final-de-arquivo inesperado no arquivo-tar" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Removendo %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Impossível remover" @@ -1317,87 +1330,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:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Final-de-arquivo inesperado no arquivo-tar" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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,572 +1418,577 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Erro ao escrever para saída padrão" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Impossível verificar arquivos-tar multi-volume" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Opções de formato do arquivo-tar conflitantes" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Opções de compressão conflitantes" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: arquivo é o arquivo-tar; não será arquivado" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Impossível mudar o diretório de trabalho" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Removendo `%.*s' inicial dos nomes dos membros" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "O volume %s não casa com %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1978,278 +1996,274 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Opções de compressão conflitantes" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " tipo de arquivo \"%s\" desconhecido\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Arquivo de datas não encontrado" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Substituindo %s pelo formato de data desconhecido %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Fator de blocagem inválido" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Tamanho da fita inválido" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Mais do que uma data limite" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Grupo inválido" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Modo inválido informado na opção" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Número de inode inválido" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Dono inválido" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Tamanho de registro inválido" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "Tamanho da fita inválido" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "A opção antiga `%c' exige um argumento." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Múltiplos arquivos-tar é exigem a opção \"-M\"" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Impossivel combinar --listed-incremental com --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Impossível verificar arquivos-tar multi-volume" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Impossível verificar arquivos-tar compactados" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Impossível usar arquivos-tar compactados multi-volume" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Impossível atualizar arquivos-tar compactados" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Recusando a criar um arquivo-tar vazio" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "As opções `-Aru' são incompatíveis com `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Deve ser especificada uma das opções \"-Acdtrux\"" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2601,6 +2615,10 @@ msgstr "--Nomes de arquivos truncados--\n" msgid "too many arguments" msgstr "" +#~ 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?" + #~ msgid "block size" #~ msgstr "tamanho de bloco" diff --git a/po/ro.gmo b/po/ro.gmo index eb358e3..d752f97 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index acb222d..18a060e 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 #, fuzzy msgid "give this help list" msgstr "Afiºeazã aceastã listã de ajutor" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 #, fuzzy msgid "give a short usage message" msgstr "Afiºeazã un scurt mesaj despre folosire" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NUME" @@ -114,11 +114,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 #, fuzzy msgid "print program version" msgstr "Afiºeazã versiunea programului" @@ -316,11 +316,11 @@ msgstr " #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -375,7 +375,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -472,6 +472,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Raportaþi bug-uri la <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -508,15 +530,6 @@ msgstr "" " --version Afiºeazã informaþii versiune.\n" " --help Afiºeazã acest mesaj.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Raportaþi bug-uri la <%s>.\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -542,104 +555,104 @@ msgstr "Sf msgid "Garbage command" msgstr "Comandã gunoi" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Numãr total octeþi scriºi: %s (%s, %s/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, 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:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Valoare invalidã pentru record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Nume arhivã nu a fost furnizat" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Nu pot verifica arhive atdin/stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiva este compresatã. Folosiþi opþiunea %s." -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Nu pot actualiza arhive comprimate" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "La începutul benzii, ieºim acum" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Prea multe erori, ieºim" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek nu s-a oprit la limita unei înregistrãri" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: conþine numãr volum invalid" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Depãºire domeniu numãr volum" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Preparã volum #%d pentru %s ºi apasã tasta return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "EOF unde era aºteptat rãspunsul utilizatorului" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "AVERTISMENT: Arhiva este incompletã" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -651,72 +664,72 @@ msgstr "" " ! Lanseazã un subshell\n" " ? Afiºeazã aceastã listã de opþiuni\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Nici un volum nou; terminãm.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "`%s' comanda a eºuat" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s nu este continuat pe acest volum" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s este de dimensiune greºitã (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Acest volum este în afara secvenþei" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiva nu este etichetatã sã se potriveascã cu %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Volumul %s nu se potriveºte cu %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, 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 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek nu s-a oprit la limita unei înregistrãri" @@ -732,7 +745,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "EOF neaºteptat în arhivã" @@ -851,7 +864,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -880,7 +893,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:535 +#: src/create.c:1591 src/incremen.c:543 #, fuzzy msgid "directory not dumped" msgstr "%s: conþine o etichetã de director cache; nimic generat" @@ -976,126 +989,126 @@ msgstr "%s: Nu pot redenumi ca %s" msgid "Error is not recoverable: exiting now" msgstr "Nu-mi pot reveni din eroare: termin acum" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Directorul a fost redenumit" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Directorul a fost redenumit" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Directorul este nou" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Înregistrare timp invalidã" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Mod invalid furnizat ca opþiune" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Numãr dispozitiv invalid" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Numãr inode invalid" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF neaºteptat în arhivã" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Nu curãþ director: nu pot determina statistici" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: ªtergem %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nu pot ºterge" @@ -1332,86 +1345,86 @@ msgstr "" " nil, existing numeroteazã dacã existã backup numerotat, altfel simplu\n" " never, simple întotdeauna creazã backup simplu\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Mod de operare principal:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "listeazã conþinutul unei arhive" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "extrage fiºiere dintr-o arhivã" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "creazã o nouã arhivã" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "gãseºte diferenþele dintre arhive ºi sistemul de fiºiere" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "adaugã fiºiere la sfârºitul unei arhive" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "adaugã numai fiºierele mai noi decât copia din arhivã" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "adaugã fiºiere tar la o arhivã" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "ºterge din arhivã (nu pe benzi magnetice!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Modificatori operaþie:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "manipuleazã eficient fiºierele rerefiate (sparse)" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "foloseºte vechiul format GNU pentru backup incremental" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FIªIER" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "foloseºte noul format GNU pentru backup incremental" -#: src/tar.c:409 +#: src/tar.c:408 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:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMÃR" -#: src/tar.c:411 +#: src/tar.c:410 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1424,306 +1437,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:417 +#: src/tar.c:416 #, fuzzy msgid "archive is seekable" msgstr "Arhiva este cãutabilã" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "încearcã sã verifici arhiva dupã scrierea sa" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "ºterge fiºierele dupã ce acestea sunt adãugate la arhivã" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "nu înlocui fiºierele existente la extragere" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "supra-scrie fiºierele existente la extragere" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "ºterge fiecare fiºier înainte de a extrage peste acesta" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "goleºte ierarhiile înainte de a extrage un director" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "pãstrazã metadata directoarelor existente" -#: src/tar.c:447 +#: src/tar.c:446 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "supra-scrie fiºierele existente la extragere" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "extrage fiºierele la ieºirea standard" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMANDÃ" -#: src/tar.c:458 +#: src/tar.c:457 #, fuzzy msgid "pipe extracted files to another program" msgstr "extrage fiºierele la ieºirea standard" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Manipulare atribute fiºiere:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "forþeazã NUME ca proprietar pentru fiºierele adãugate" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "forþeazã NUME ca grup pentru fiºierele adãugate" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATA-FIªIERULUI" -#: src/tar.c:474 +#: src/tar.c:473 #, 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "SCHIMBÃRI" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "forþeazã mod (simbolic) SCHIMBÃRI pentru fiºierele adãugate" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "nu extrage timpul de modificare al fiºierului" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "încearcã extragerea fiºierelor cu aceleaºi drepturi (ownership)" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "extrage fiºierele ca dvs. însuºi" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "foloseºte întotdeauna numere pentru numele utilizator/grup" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "sorteazã numele de extras sã se potriveascã cu arhiva" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "la fel ca -p ºi -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Selectare ºi schimbare unitate:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARHIVÃ" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "foloseºte fiºier arhivã sau unitate ARHIVÃ" -#: src/tar.c:515 +#: src/tar.c:514 #, 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "foloseºte rmt COMANDà în loc de rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "foloseºte remote COMANDà în loc de rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "specificã unitate ºi densitate" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "creazã/listeazã/extrage arhiva pe volume multiple" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "schimbã banda dupã scriere a NUMÃR x 1024 octeþi" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "ruleazã script la terminarea fiecãrei benzi (implicã -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "foloseºte/actualizeazã numãrul de volum în FIªIER" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Blocuri unitate:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOCURI" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCURI x 512 octeþi pe întregistrare" -#: src/tar.c:554 +#: src/tar.c:553 #, fuzzy msgid "NUMBER of bytes per record, multiple of 512" msgstr "DIMENSIUNE octeþi pe înregistrare, multiplu de 12" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorã blocuri zero-uate în arhivã (înseamnã EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "redimensioneazã bloc în timpul citirii (pentru pipe-uri BSD4.2" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Selecþie format arhivã:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 #, fuzzy msgid "create archive of the given format" msgstr "creazã arhiva de formatul dat." -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMAT este unul din urmãtoarele" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "vechiul format tar V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "oldgnu formatul GNU format ca pentru tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "formatul GNU tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formatul POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formatul POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 #, fuzzy msgid "same as pax" msgstr "ca ºi pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "ca ºi --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "ca ºi --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "cuvânt_cheie[[:]=valoare][,cuvânt_cheie[[:]=valoare], ...]" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "controleazã cuvintele cheie pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:589 +#: src/tar.c:588 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " @@ -1732,191 +1745,196 @@ msgstr "" "creazã arhivã nu nume volum NUME. La listare/extragere, foloseºte TEXT ca " "pattern de globbing" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Opþiunile de compresie sunt în conflict" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "filtrazã arhiva prin bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "filtreazã arhiva prin gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "filtreazã arhiva prin compress" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "filtreazã arhiva prin gzip" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "filtreazã arhiva prin gzip" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "filtreazã arhiva prin gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "filtreazã prin PROG (trebuie sã accepte -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Selecþie fiºier local:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "DIR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "schimbã în directorul DIR" -#: src/tar.c:626 +#: src/tar.c:627 #, 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:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T citeºte nume terminate cu null, deactiveazã cu -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "exclude fiºiere, date ca un PATTERN" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "pattern-urile de excludere sunt listate în FIªIER" -#: src/tar.c:640 +#: src/tar.c:641 #, 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:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:648 +#: src/tar.c:649 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:653 +#: src/tar.c:654 #, fuzzy msgid "exclude directories containing FILE" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "evitã coborârea automatã în directoare" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "stai în sistemul de fiºire local la creare arhivei" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "coboarã recursiv în directoare (implicit)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "nu elimina primul `/' din numele fiºierelor" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "NUME-MEMBRU" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "începe la membrul NUME-MEMBRU în arhivã" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "stocheazã numai fiºiere mai noi decât DATA-FIªIERULUI" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATA" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "comparã data ºi timpul numai când a fost schimbatã data" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "fã backup înainte de ºtergere, alege CONTROL pentru versiuni" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "ªIR" -#: src/tar.c:678 +#: src/tar.c:679 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -1925,95 +1943,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:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 #, 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 #, fuzzy msgid "ignore case" msgstr "în excluderi ignorã cazul caracterelor (minuscule/majuscule)" -#: src/tar.c:699 +#: src/tar.c:700 #, fuzzy msgid "patterns match file name start" msgstr "pattern-urile de excludere potrivesc începutul numelor de fiºiere" -#: src/tar.c:701 +#: src/tar.c:702 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "pattern-urile de excludere potrivesc dupã orice / (implicit)" -#: src/tar.c:703 +#: src/tar.c:704 #, fuzzy msgid "case sensitive matching (default)" msgstr "excluderea depinde de caz (minuscule/majuscule) (implicit)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "wildcard-urile în pattern-urile de excludere nu potrivesc '/'" -#: src/tar.c:711 +#: src/tar.c:712 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "wildcard-urile din pattern-urile de excludere potrivesc '/' (implicit)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Ieºire informativã:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "listeazã cu amãnunte fiºierele procesate" -#: src/tar.c:721 +#: src/tar.c:722 #, 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 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:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2021,28 +2039,28 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "afiºeazã datele de modificare a fiºierelor în UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "trimite ieºire detaliatã în FIªIER" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "aratã numãrul blocului din arhivã pentru fiecare mesaj" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "cere confirmare pentru fiecare acþiune" -#: src/tar.c:743 +#: src/tar.c:744 #, fuzzy msgid "show tar defaults" msgstr "Aratã valorire implicite folosite de tar" -#: src/tar.c:745 +#: src/tar.c:746 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " @@ -2051,88 +2069,88 @@ msgstr "" "La listare sau extragere, listeazã fiecare director care nu se potriveºte cu " "criteriile de cãutare" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Opþiuni compatibilitate:" -#: src/tar.c:763 +#: src/tar.c:764 #, 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:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Alte opþiuni:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Opþiunile de compresie sunt în conflict" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " tip fiºier necunoscut %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Fiºier date nu a fost gãsit" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Înlocuim %s pentru format de datã necunoscut %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, fuzzy, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Tratez data `%s' ca %s + %ld nanosecundã" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: fiºierul este în arhivã; nimic generat" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2140,163 +2158,159 @@ msgstr "" "\n" "*Acest* tar foloseºte implicit:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Factor blocuri invalid" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Lungime de bandã invalidã" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Mai mult de o singurã datã limitã" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Grup invalid" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Mod invalid furnizat ca opþiune" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Numãr invalid" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Proprietar invalid" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Dimensiune înregistrare invalidã" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Dimensiune înregistrare trebuie sã fie un multiplu de %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Numãr invalid de elemente" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "Argument densitate malformat: '%s'" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Densitate necunoscutã: '%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FIªIER]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Vechea opþiune `%c' necesitã un argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence n-are sens fãrã o listã de fiºiere" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence nu poate fi folosit în modul de operare cerut" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Fiºiere de arhivã multiple necesitã opþiunea `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Nu puteþi combina --listed-incremental cu --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Nu pot verifica arhive pe volume multiple" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Nu pot verifica arhive comprimate" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Nu pot folosi arhive comprimate pe volume multiple" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Nu pot actualiza arhive comprimate" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option poate fi folosit numai pentru arhive POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Refuz categoric sã creez o arhivã goalã" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Opþiunile `-Aru' sunt incompatibile cu `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Trebuie sã specificaþi una din opþiunile `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2655,6 +2669,10 @@ msgstr "--Amestecat numele fi msgid "too many arguments" msgstr "" +#~ 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?" + #~ msgid "block size" #~ msgstr "dimensiune bloc" diff --git a/po/ru.gmo b/po/ru.gmo index f9ee239..feb394f 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 901660e..0f3807a 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "вывод этой справки" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "вывод короткого сообщения об использовании" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "ИМЯ" @@ -113,11 +113,11 @@ msgstr "определяет название программы" msgid "SECS" msgstr "СЕК" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "ожидание в течение заданных СЕКУНД (по умолчанию 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "вывод версии программы" @@ -314,11 +314,11 @@ msgstr "`.' заменяются пустыми целями жестких сс #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -373,7 +373,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -470,6 +470,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Отчёты об ошибках отправляйте на <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Слишком длинная входная строка" @@ -507,15 +529,6 @@ msgstr "" " --version Вывод информации о версии.\n" " --help Вывод этой справки.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Отчёты об ошибках отправляйте на <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Ошибка смещения поиска" @@ -540,104 +553,104 @@ msgstr "Преждевременный конец файла" msgid "Garbage command" msgstr "Неверная команда" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Всего записано байт" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Всего прочитано байт" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Всего удалено байт: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Неверное значение для record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Не указано имя архива" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Невозможно проверить архив на stdin/stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архив сжат. Используйте опцию %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Невозможно обновить сжатые архивы" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Начало ленты, завершение работы" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Слишком много ошибок, завершение работы" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Размер записи = %lu блок" msgstr[1] "Размер записи = %lu блоков" -#: src/buffer.c:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Невозможно вернуться назад на один архивный файл; он может быть нечитаемым " "без -i" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не остановился на границе записи" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: содержит неверный номер тома" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Переполнение номера тома" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Приготовьте том Номер %d для %s и нажмите Enter: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Конец файла вместо ожидаемого ответа пользователя" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ПРЕДУПРЕЖДЕНИЕ: Архив не полный" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -649,66 +662,66 @@ msgstr "" " q Выход из tar\n" " y или [нов.строка] Продолжение операциия\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Порождение подпроцесса командного процессора\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Вывод этого списка\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Нет нового тома, завершение работы.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Не указано имя имя файла. Попробуйте ещё раз.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Неверные входные данные. Наберите ? для получения справки.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "Сбой команды %s" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s, возможно, продолжается на этом томе - в заголовке находится усечённое имя" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продолжается на этом томе" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s является неверным размером (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Этот том нарушает последовательность" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Метка архива не соответствует %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Том %s не соответствует %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -716,7 +729,7 @@ msgstr "" "%s: слишком длинное имя файла для сохранения в многотомном заголовке GNU; " "обрезано" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek не остановился на границе записи" @@ -732,7 +745,7 @@ msgstr[1] "Можно было прочитать только %lu байт из msgid "Contents differ" msgstr "Содержимое отличается" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Неожиданный конец файла в архиве" @@ -850,7 +863,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "содержимое не сброшено" @@ -879,7 +892,7 @@ msgstr "%s: файл является архивом; не сброшен" msgid "%s: File removed before we read it" msgstr "%s: Файла удален до его считывания" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "каталог не сброшен" @@ -973,122 +986,122 @@ msgstr "Невозможно переименовать %s в %s" msgid "Error is not recoverable: exiting now" msgstr "Неисправимая ошибка: завершение работы" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталог был переименован из %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталог был переименован" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Каталог новый" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Неверная временная метка" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Неверное время изменения (секунды) " -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Неверное время изменения (наносекунды)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Неверный номер устройства" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Неверный номер inode" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Слишком длинное поле при чтении из snapshot-файла" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Ошибка чтения snapshot-файла" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Неожиданный конец файла snapshot-файле" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Неожиданное значения поля в snapshot-файле" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Отсутствует указатель конца записи" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Неверный формат инкрементного файла" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Неподдерживаемая версия инкрементного формата: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Неверно сформирован dump-каталог: ожидался '%c', а найден %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Неверно сформирован dump-каталог: 'X' повторяется" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Неверно сформирован dump-каталог: пустое имя в 'R'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Неверно сформирован dump-каталог: перед 'T' не стоит 'R'" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Неверно сформирован dump-каталог: пустое имя в 'T'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Неверно сформирован dump-каталог: ожидался '%c', а найден конец данных" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Неверно сформирован dump-каталог: 'X' ни разу не использован" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Невозможно создать временный каталог с помощью шаблона %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не удалён: невозможно выполнить stat" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог находится на другом устройстве: не удален" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Удаляется %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Невозможно удалить" @@ -1311,87 +1324,87 @@ msgstr "" "простые\n" " never, simple всегда создавать простые резервные копии\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Основной режим работы:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "вывод списка содержимого архива" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "извлечение файлов из архива" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "создание нового архива" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "поиск различий между архивом и файловой системой" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "добавление файлов в конец архива" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "добавление в архив только более новых файлов" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "присоедининие tar-файлов к архиву" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "удаление из архива (не на магнитных лентах!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "проверка метки тома архива и выход" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Модификаторы:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "эффективная обработка разрежённых файлов" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "установить версию используемого формата разрежения (подразумевает --sparse)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "обработка добавочного резервирования старого формата GNU" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "обработка добавочного резервирования нового формата GNU" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "не завершать работу при ненулевом статусе для нечитаемых файлов" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1403,121 +1416,121 @@ msgstr "" "list, и когда список файлов задан либо в командной строке, либо через опцию -" "T. По умолчанию N равен 1." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "доступен поиск по архиву" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Управление перезаписью:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "попытка проверить архив после его записи" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "удаление файлов после их добавления в архив" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "не перезаписывать существующие файлы при извлечении" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "не перезаписывать существующие файлы, которые более новые, чем их копии в " "архиве" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "перезапись существующих файлов при извлечении" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "удаление каждого файла до извлечения поверх него" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "очистка всей иерархии до извлечения каталога" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "сохранение метаданных существующих каталогов" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "перезапись существующих файлов при извлечении (по умолчанию)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Выбор выходного потока:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "извлекать файлы на стандартный вывод" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "перенаправлять извлечённые файлы в другую программу" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "игнорировать коды завершения дочерних процессов" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "считать ненулевые коды завершения дочерних процессов как ошибку" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Обработка атрибутов файлов:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" "принудительно устанаваливать ИМЯ в качестве владельца для добавленных файлов" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" "принудительно устанаваливать ИМЯ в качестве группы для добавленных файлов" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "ДАТА-ИЛИ-ФАЙЛ" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "устанаваливать для добавленных файлов mtime из ДАТЫ-ИЛИ-ФАЙЛА" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "РЕЖИМ" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" "принудительно устанавливать (символьный) РЕЖИМ доступа для добавляемых файлов" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "СПОСОБ" -#: src/tar.c:479 +#: src/tar.c:478 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,29 +1540,29 @@ msgstr "" "после чтения (СПОСОБ='replace'; используется по умолчанию) или не установки " "времени в первую очередь (СПОСОБ='system')" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "не извлекать время изменения файла" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "попытаться извлечь файлы с тем же владельцем" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "извлекать файлы как свои собственные" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "использовать числа вместо имён владельца/группы" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "извлекать информацию о правах доступа к файлу (по умолчанию для " "суперпользователя)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1557,15 +1570,15 @@ msgstr "" "применять umask пользователя при извлечении прав доступа из архива (по " "умолчанию для обычных пользователей)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "сортировать извлекаемые имена в том же порядке, что и в архиве" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "эквивалент -p и -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1573,140 +1586,140 @@ msgstr "" "не устанавливать время изменения и права доступа извлечённых каталогов до " "завершения процесса извлечения" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "отменить действие опции --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Выбор и переключение устройств:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "АРХИВ" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "использовать файл или устройство АРХИВ" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "файл архива является локальным, даже если содержит двоеточие" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "использовать указанную КОМАНДУ rmt вместо rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "использовать удалённую КОМАНДУ вместо rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "указать устройство и плотность" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "создание/листинг/извлечение многотомных архивов" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "сменить ленту после записи ЧИСЛО x 1024 байт" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" "запустить скрипт по окончании каждой ленты (подразумевается использование -М)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "использовать/обновлять номера тома в ФАЙЛЕ" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Разбиение на блоки:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "БЛОКИ" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "число БЛОКОВ x 512 байт на запись" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ЧИСЛО байт на запись, кратное 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "игнорировать нулевые блоки в архиве (т.е. EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "заново разбивать на блоки при чтении (для каналов 4.2BSD)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Формата архива:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "создать архив в указанном формате" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "ФОРМАТОМ может быть:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "старый формат tar V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "формат GNU как в tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "формат GNU tar 1.13.х" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "эквивалент pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "эквивалент --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "эквивалент --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "keyword[[:]=значение][,keyword[[:]=значение]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "управляющие ключевые слова pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1714,98 +1727,103 @@ msgstr "" "создать архив с именем тома ТЕКСТ; при листинге/извлечении использовать " "ТЕКСТ в качестве шаблона подстановки" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Конфликт опций сжатия" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "пропустить архив через bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "пропустить архив через gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "пропустить архив через compress" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "пропустить архив через gzip" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "пропустить архив через gzip" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "пропустить архив через gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "пропустить архив через ПРОГ (должна поддерживать -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Выбор локальных файлов:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "добавить указаный ФАЙЛ в архив (полезно, если имя начинается с дефиса)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "КАТАЛОГ" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "перейти в КАТАЛОГ" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "загрузить из ФАЙЛА имена для извлечения или создания" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T читает строки, оканчивающиеся нулём, отключает опцию -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "убрать кавычки с имён файлов, прочитанных с опцией -T (по умолчанию)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "не убирать кавычки с имён файлов, прочитанных с опцией -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "ШАБЛОН" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "исключать файлы, определённые ШАБЛОНОМ" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "исключать шаблоны, перечисленных в ФАЙЛЕ" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1813,90 +1831,90 @@ msgstr "" "исключать содержимое каталогов с файлом CACHEDIR.TAG за исключением самого " "файла с тегами" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "исключать всё содержимое каталогов, содержащих файл CACHEDIR.TAG" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "исключать каталоги, содержащие файл CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "исключать каталоги, содержащие ФАЙЛ, за исключением самого ФАЙЛА" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "исключать всё содержимое каталогов, содержащих ФАЙЛ" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "исключать каталоги с ФАЙЛОМ" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "исключать каталоги CVS" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "отключить автоматический спуск в каталоги" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "оставаться в локальной файловой системе при создании архива" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "рекурсивный спуск по каталогам (по умолчанию)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "не удалять начальные `/' из имен файлов" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "следовать по символьным ссылкам и сохранять файлы, на которые они указывают" -#: src/tar.c:667 +#: src/tar.c:668 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "" "следовать по символьным ссылкам и сохранять файлы, на которые они указывают" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "ИМЯ-ЧЛЕНА" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "начинать с члена ИМЯ-ЧЛЕНА в архиве" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "сохранять только те файлы, которые новее ДАТЫ-ИЛИ-ФАЙЛА" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "сравнивать дату и время, только если изменены данные" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "УПРАВЛЕНИЕ" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "делать копию перед удалением, УПРАВЛЕНИЕ выбора версий" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "СТРОКА" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1904,93 +1922,93 @@ msgstr "" "делать копию перед удалением, переопределяет обычный суффикс ('~', если " "только он не переопределён переменной окружения SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Преобразвание имён файлов:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "удалять указанное ЧИСЛО начальных компонентов из имён файлов перед " "извлечением" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "РАСШИРЕНИЕ" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "использовать замену РАСШИРЕНИЯ sed'ом для преобразования имён файлов" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Параметры шаблонов подстановки для имён файлов (вляют на шаблюны включения и " "исключения):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "игноририровать регистр" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "шаблоны начала имени файла" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "шаблоны после любого '/' (по умолчанию для исключаемых)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "с учётом регистра (по умолчанию)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "использовать маски (по умолчанию для исключаемых)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "точное соответствие строке" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "маски не соответствуют '/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "маски соответствут '/' (по умолчанию для исключаемых)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Вывод информации:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "подробный листинг обрабатываемых файлов" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "вывод сообщений о ходе выполнения через каждые ЧИСЛО записей (по умолчанию " "10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "вывод сообщений, если сохранены не все ссылки" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:729 +#: src/tar.c:730 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 +2020,27 @@ msgstr "" "SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2. Также разрешается использовать имена без " "префикса SIG" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "вывод даты изменения файла в формате UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "отправить подробный вывод данных в FILE" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "выводить номера блоков архива в каждом сообщении" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "запрашивать подтверждение для каждого действия" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "показать значения tar по умолчанию" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2030,31 +2048,31 @@ msgstr "" "при выводе листинга или извлечении показывать все каталоги, не " "соответствующем условию поиска" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "показывать имена файлов или архивов после преобразования" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "установить стиль цитирования имён. Значения для СТИЛЯ см. ниже" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "дополнительно цитировать символы из СТРОКИ" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "отключить цитирование символов из СТРОКИ" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Опции совместимости:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2062,56 +2080,56 @@ msgstr "" "при создании, эквивалент --old-archive; при извлечении, эквивалент --no-same-" "owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Другие опции:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "отключить использование некоторых потенциально опасных опций" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Указать можно не более одной опции `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Конфликт опций сжатия" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Неизвестное название сигнала: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Файл с образцом даты не найден" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s заменяется на неизвестный формат даты %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Опция `%s': дата '%s' рассматривается как %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: список файлов уже прочитан" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: в прочитанном имени файла присутствует пустой символ" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Допустимые агрументы для опций --quoting-style:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2119,163 +2137,158 @@ msgstr "" "\n" "Значения по умолчанию *этого* tar:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Неверный размер ёмкости блока" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Неверная длина ленты" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Больше одной пороговой даты" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Неверное значение версии разрежения" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' не поддерживается на этой платформе" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "значение --checkpoint не явлется целым числом" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Неверная группа" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "В опции указан неверный режим доступа" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Неверное число" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Неверный владелец" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Неверный размер записи" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Размер записи должен быть кратен %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Неверное число элементов" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Разрешается использовать только одну опцию --to-command" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Неверно сформирован аргумент плотности: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Неизвестная плотность: '%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Опции `-[0-7][lmh]' не поддерживаются *этим* tar'ом" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Для старой опции `%c' нужно указать аргумент." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence бесполезна без списка файлов" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence не может быть использована запрошеном режиме работы" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Для нескольких файлов архивов требуется опция `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Нельзя комбинировать --listed-incremental с --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Невозможно проверить многотомные архивы" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Невозможно проверить сжатые архивы" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Невозможно использовать многотомные сжатые архивы" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Невозможно объединить сжатые архивы" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option может быть использована только с архивами POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Робкий отказ от создания пустого архива" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Опции `-Aru' не совместимы с `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Вы должны указать одну из опций `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2648,6 +2661,11 @@ msgstr "для опции --stat нужны имена файлов" msgid "too many arguments" msgstr "слишком много аргументов" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "" +#~ "Предупреждение: опция -I не поддерживается; может имелась в виду -j или -" +#~ "T?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "отменить действие опции --delay-directory-restore" diff --git a/po/sk.gmo b/po/sk.gmo index e142a50..1510e0e 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 56768df..d1bc869 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -115,11 +115,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -317,11 +317,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -376,7 +376,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -473,6 +473,30 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, fuzzy, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +" Chyby v programe oznamujte na adresa (iba anglicky),\n" +"pripomienky k pkekladu zasielajte na adresu " +"(slovensky).\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -509,17 +533,6 @@ msgstr "" " --version Vypí¹e oznaèenie verzie\n" " --help Vypí¹e túto nápovedu\n" -#: rmt/rmt.c:315 -#, fuzzy, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -" Chyby v programe oznamujte na adresa (iba anglicky),\n" -"pripomienky k pkekladu zasielajte na adresu " -"(slovensky).\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -545,103 +558,103 @@ msgstr "Pred msgid "Garbage command" msgstr "Neznámy príkaz" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "Celkom zapísané bajtov: %s (%sB, %sB/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Celkom zapísané bajtov: %s (%sB, %sB/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(rúra)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Chybná hodnota pre veµkos» záznamu" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Meno archívu nebolo zadané" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Stdin/Stdout archív nie je mo¾né otvori»" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Komprimovaný archív nie je mo¾né aktualizova»" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Páska na zaèiatku, konèím" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Príli¹ mnoho chýb, konèím" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: vracia chybné èíslo zväzku" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Èíslo zväzku preteèené" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Namiesto u¾ívateµskej odpovede bol zadaný koniec súboru" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "VAROVANIE: Archiv je nekompletný" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -653,71 +666,71 @@ msgstr "" " ! Vytvorenie podshellu\n" " ? Vypísanie tejto nápovedy\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Nie je nový zväzok; konèím.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "'%s' príkaz zlyhal" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s nepokraèuje na tomto zväzku" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je chybnej då¾ky (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, 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:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Pre vyhodnotenie vzorky `%s' musí by» archív pomenovaný" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Zväzok %s nezodpovedá vzorke %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -732,7 +745,7 @@ msgstr[1] "D msgid "Contents differ" msgstr "Obsah sa lí¹i" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Neoèekávaný koniec archívu" @@ -850,7 +863,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -879,7 +892,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -975,124 +988,124 @@ msgstr "%s: nie je mo msgid "Error is not recoverable: exiting now" msgstr "Z chyby sa nie je mo¾né zotavi»: ukonèuje sa" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Adresár bol premenovaný" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Adresár bol premenovaný" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Adresár je nový" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Neplatný èas súboru" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "Zadáné chybné práva" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Neplatné èíslo zariadenia" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Neplatné èíslo i-uzlu" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekávaný koniec archívu" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Ma¾em %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nedá sa zmaza»" @@ -1317,87 +1330,87 @@ msgstr "" " existujú, inak tvorí jednoduché\n" " never, simple tvorí v¾dy jednoduché zálo¾né kópie súborov\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 #, fuzzy msgid "create a new archive" msgstr "Neoèekávaný koniec archívu" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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,572 +1418,577 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 #, fuzzy msgid "extract files to standard output" msgstr "Chyba pri zápise na ¹tandardný výstup" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Víczväzkový archív nie je mo¾né otvori»" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 #, fuzzy msgid "Archive format selection:" msgstr "Odporujúce si archívne formáty" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Odporujúce si kompresné prepínaèe" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 #, fuzzy msgid "filter the archive through gzip" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:607 +#: src/tar.c:606 #, fuzzy msgid "filter the archive through compress" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "%s: súbor je archiv; nearchivovaný" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "%s: súbor je archiv; nearchivovaný" + +#: src/tar.c:614 msgid "PROG" msgstr "" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 #, fuzzy msgid "change to directory DIR" msgstr "Pracovný adresár nie je mo¾né zmeni»" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 #, fuzzy msgid "don't strip leading `/'s from file names" msgstr "Odstraòujem úvodné `%.*s' z názvov súborov" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "Zväzok %s nezodpovedá vzorke %s" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1978,280 +1996,274 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Odporujúce si kompresné prepínaèe" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " neznámy typ súboru %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Dátumový súbor nebol nájdený" -#: src/tar.c:1017 +#: src/tar.c:1018 #, 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:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Neplatný poèet bajtov na záznam" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Neplatná då¾ka pásky" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Viac ako jeden poèiatoèný dátum" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Chybná skupina" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Zadáné chybné práva" -#: src/tar.c:1775 +#: src/tar.c:1774 #, fuzzy msgid "Invalid number" msgstr "Neplatné èíslo i-uzlu" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Neplatný vlastník" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Chybná veµkos» záznamu" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Veµkos» záznamu musí by» násobok %d." -#: src/tar.c:1873 +#: src/tar.c:1872 #, fuzzy msgid "Invalid number of elements" msgstr "Neplatná då¾ka pásky" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Prepínaè `%c' vy¾aduje argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 #, fuzzy msgid "Multiple archive files require `-M' option" msgstr "Viac archivaèných súborov vy¾aduje prepínaè `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental a --newer nie je mo¾né kombinova»" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Víczväzkový archív nie je mo¾né otvori»" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Komprimovaný archív nie je mo¾né otvori»" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Viaczväzkový komprimovaný archív nie je mo¾né vytvori»" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Komprimovaný archív nie je mo¾né aktualizova»" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Vytvorenie prázdneho archívu odmietnuté." -#: src/tar.c:2389 +#: src/tar.c:2388 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:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Musíte zada» jeden z prepínaèov `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2603,6 +2615,11 @@ msgstr "--Rozdelen msgid "too many arguments" msgstr "" +#~ 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!" + #~ msgid "block size" #~ msgstr "veµkos» bloku" diff --git a/po/sl.gmo b/po/sl.gmo index 662e306..8fb7184 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 1a1fc35..33da6ba 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.19\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2007-10-17 10:26+0200\n" "Last-Translator: Primož Peterlin \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "poda ta seznam pomoči" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "poda kratka navodila za uporabo" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: 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:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "premor SEK sekund (privzeto 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "izpis izdaje programa" @@ -322,11 +322,11 @@ msgstr "Nadomeščamo manjkajoča imena trdih povezav s ».«<" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "»" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "«" @@ -381,7 +381,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -478,6 +478,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Poročila o napakah javite na <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -514,15 +536,6 @@ msgstr "" " --version različica programa\n" " --help ta navodila\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Poročila o napakah javite na <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Napaka pri odmiku pri seek" @@ -547,58 +560,58 @@ msgstr "Predčasen znak za konec datoteke" msgid "Garbage command" msgstr "Neveljaven ukaz" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Skupno zapisanih bajtov" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Skupno prebranih bajtov" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "Skupno izbrisanih bajtov: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(cev)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Neveljavna vrednost za dolžino zapisa (record_size)" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Ime arhiva ni podano" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Arhivov na stdin/stdout ni mogoče preveriti" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiv je stisnjen. Uporabite izbiro %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Stisnjenega arhiva ni mogoče ažurirati" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Na začetku traku, končujem" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Preveč napak, končujem" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -607,7 +620,7 @@ msgstr[1] "Dolžina zapisa = %lu blok" msgstr[2] "Dolžina zapisa = %lu bloka" msgstr[3] "Dolžina zapisa = %lu bloki" -#: src/buffer.c:716 +#: src/buffer.c:718 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -616,37 +629,37 @@ msgstr[1] "Neporavnan blok (%lu bajt) v arhivu" msgstr[2] "Neporavnan blok (%lu bajta) v arhivu" msgstr[3] "Neporavnan blok (%lu bajti) v arhivu" -#: src/buffer.c:793 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek se ni ustavil na meji zapisa" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: vsebuje neveljavno številko dela" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Prekoračitev številke dela" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Pripravite del #%d za %s in pritisnite Return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Znak EOF na mestu, kjer se pričakuje odgovor uporabnika" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "POZOR: Arhiv nepopoln" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -657,65 +670,65 @@ msgstr "" " q Končamo tar\n" " y, newline Nadaljujemo z delovanjem\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Poženemo ukazno podlupino\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Ta seznam uzazov\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Novega dela ni, konec.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Neveljaven vnos. Vtipkajte ? za pomoč.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "ukaz %s neuspešen" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s se ne nadaljuje v tem delu" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je napačne velikosti (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ta del ne sodi v zaporedje" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiv ni označen skladno z %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Del %s ne ustreza %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -723,7 +736,7 @@ msgstr "" "%s: ime datoteke je predolgo za zapis v zaglavje GNU večdelnega arhiva; " "porezano" -#: src/buffer.c:1619 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "Arhiv %s se ne konča s koncem bloka" @@ -741,7 +754,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Nepričakovan znak za konec datoteke v arhivu" @@ -864,7 +877,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "vsebina ni iznešena" @@ -893,7 +906,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "imenik ni iznašen" @@ -990,124 +1003,124 @@ msgstr "Preimenovanje %s v %s ni mogoče" msgid "Error is not recoverable: exiting now" msgstr "Napake ni moč popraviti: zapuščamo" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Imenik je bil preimenovan z %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Imenik je bil preimenovan" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Imenik je nov" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Neveljavna oznaka časa" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Neveljaven čas spremembe (sekunde)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Neveljaven čas spremembe (nanosekunde)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Neveljavna številka enote" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Neveljavna številka inoda" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Predolgo polje pri branju trenutnega posnetka" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Napaka pri branju trenutnega posnetka" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Nepričakovan znak za konec datoteke v trenutnem posnetku" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Nepričakovana vrednost polja v trenutnem posnetku" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Manjkajoč zaključek zapisa" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Okvarjen inkrementalni zapis datoteke" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nepodprta različica inkrementalnega zapisa: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Okvarjen argument gostote: »%s«" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Okvarjen argument gostote: »%s«" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Imenika ne čistimo: statistika zanj ni dosegljiva" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Brišemo %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Odstranitev ni mogoča" @@ -1331,86 +1344,86 @@ msgstr "" " sicer enostavne\n" " never, simple vedno enostavne varnostne kopije\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Glavni načini delovanja:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "izpis vsebine arhiva" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "izvlečenje datoteke iz arhiva" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "ustvarjanje novega arhiva" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "iskanje razlik med arhivom in datotečnim sistemom" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "dodajanje datotek na konec arhiva" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "dodajanje novih datotek, če so novejše od že arhiviranih" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "zlivanje arhivov" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "brisanje datotek iz arhiva (ne deluje na traku!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Določila delovanja:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "ekonomično ravnanje z razpršenimi datotekami" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "stari zapis GNU za inkrementalne arhive" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "DATOTEKA" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "novi zapis GNU za inkrementalne arhive" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "nadaljuj z branjem, tudi če datoteke ni moč prebrati" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "N" -#: src/tar.c:411 +#: src/tar.c:410 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1423,118 +1436,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "po arhivu je mogoče iskati" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Nadzor nad pisanjem prek:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "s poskusom preverjanja zapisanega arhiva" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "pobriši datoteke, potem ko so arhivirane" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "pri izvlačenju ne piši prek obstoječih datotek" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "pri izvlačenju piši prek obstoječih datotek" -#: src/tar.c:441 +#: src/tar.c:440 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:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "izprazni hierarhije pred izvlačenjem imenikov" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "ohrani metainformacije o obstoječih imenikih" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "pri izvlačenju piši prek metapodatkov obstoječih imenikov (privzeto)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Izbira izhodnega toka:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "datoteke izvleci na standardni izhod" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "UKAZ" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "datoteke napelji na vhod drugega programa" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "prezri izhodne kode hčerinskih procesov" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "obravnavaj neničelne izhodne kode hčerinskih procesov kot napako" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Ravnanje z atributi datotek:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "pri dodajanju datotek spremenimo lastnika v IME" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "pri dodajanju datotek spremenimo skupino v IME" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATUM-ČAS" -#: src/tar.c:474 +#: src/tar.c:473 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "shrani le datoteke, novejše od DATUM-ČAS" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "SPREMEMBE" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "zahtevaj (simbolne) SPREMEMBE zaščite za dodane datoteke" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METODA" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1544,29 +1557,29 @@ msgstr "" "branju (METODA=replace, privzeto) ali tako, da se časa sploh ne nastavi " "(METODA=system)" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "brez izvlačenja časa spremembe" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "z ohranitvijo lastništva, če je mogoče" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "pri izvlačenju prepišemo lastništvo nase" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "s številčnimi vrednostmi UID/GID namesto imen" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "izvleci podatke o dovoljenjih za dostop do datotek (privzeto za " "administratorja)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1574,15 +1587,15 @@ msgstr "" "uporabi uporabnikovo masko umask pri izvlačenju dovoljenj za dostop do " "datotek (privzeto za uporabnike)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "imena razvrstimo tako, da se ujemajo z arhivom" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "isto kot -p in -s skupaj" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1590,140 +1603,140 @@ msgstr "" "počakaj do končanega izvlačenja, preden nastavimo čase sprememb in " "dovoljenja za dostop za izvlečene imenike" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "prekliči učinek izbire --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Izbira enote in preklapljanje:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARHIV" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "uporabi datoteko ali enoto ARHIV" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "arhiv je lokalen kljub dvopičju v imenu datoteke" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "uporabi navedeni UKAZ rmt namesto rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "uporabi nelokalen UKAZ namesto rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "določi enoto in gostoto zapisa" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "ustvari/pregledaj/izvleci arhiva v več delih" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "menjava traku po ŠT x 1024 zapisanih bajtih" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "poženi SKRIPT po koncu traku (privzema -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "uporabimo/ažuriramo število dela v DATOTEKI" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Bločna razdelitev enote:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOKI" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "dolžina zapisa BLOKI × 512 bajtov" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ŠTEVILO bajtov v zapisu (večkratnik 512)" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ne meni se za bloke ničel (EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "razdeli na bloke ob branju (cevovodi 4.2BSD)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Izbira oblike arhiva:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "OBLIKA" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "ustvari arhiv v navedeni obliki" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "OBLIKA je nekaj od naštetega:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "oblika starega V7 tar" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "stara oblika GNU tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "oblika GNU tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "oblika POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "oblika POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "isto kot pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "isto kot --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "isto kot --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ključna-beseda[[:]=vrednost][,ključna-beseda[[:]=vrednost],...]" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "krmilne ključne besede pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "VZOREC" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1731,193 +1744,199 @@ msgstr "" "ustvari arhiv z imenom dela IME; pri izpisu seznama/izvlečku je lahko IME " "regularni izraz za ime dela" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Nasprotujoče si izbire glede stiskanja arhiva" -#: src/tar.c:596 +#: src/tar.c:595 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Pisanje na vhod programa za stiskanje ne gre" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" -msgstr "" +#: src/tar.c:597 +#, fuzzy +msgid "do not use archive suffix to determine the compression program" +msgstr "Pisanje na vhod programa za stiskanje ne gre" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "filtriraj arhiv skozi bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "filtriraj arhiv skozi gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "filtriraj arhiv skozi compress" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "filtriraj arhiv skozi gzip" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "filtriraj arhiv skozi gzip" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "filtriraj arhiv skozi gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "filtriraj skozi PROGRAM (sprejemati mora izbiro -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Izbira lokalne datoteke:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "IMENIK" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "pomik v navedeni IMENIK" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "preberi seznam datotek z navedene DATOTEKE" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T prebere z \\000 terminirana imena; onemogoči -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "odstrani narekovaje iz imen datotek, prebranih s -T (privzeto)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "ne odstrani narekovajev iz imen datotek, prebranih s -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "VZOREC" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "brez datotek, ki jih opisuje VZOREC" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "brez datotek, ustrezajočim vzorcem, prebranih z DATOTEKE" -#: src/tar.c:640 +#: src/tar.c:641 #, 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:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:648 +#: src/tar.c:649 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:653 +#: src/tar.c:654 #, fuzzy msgid "exclude directories containing FILE" msgstr "brez imenikov, ki vsebujejo značko medpomnilnika" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "podimenikov ne vključujemo avtomatično" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "pri arhiviranju izpusti datoteke na nelokalnih datotečnih sistemih" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "rekurzivno vključi vse podimenike" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "ne odstrani vodilnih »/« iz imen datotek" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "sledi simbolnim povezavam; arhiviraj/iznesi ciljne datoteke" -#: src/tar.c:667 +#: src/tar.c:668 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "sledi simbolnim povezavam; arhiviraj/iznesi ciljne datoteke" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "IME" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "začenši z navedenim IMENOM v arhivu" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "shrani le datoteke, novejše od DATUM-ČAS" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATUM" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "primerjaj datum in uro le, kadar se podatki spremenijo" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "TIP" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" "varnostna kopija pred brisanjem, z možnostjo izbire TIPA varnostne kopije" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "NIZ" -#: src/tar.c:678 +#: src/tar.c:679 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -1926,97 +1945,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:683 +#: src/tar.c:684 #, fuzzy msgid "File name transformations:" msgstr "Druge izbire:" -#: src/tar.c:685 +#: src/tar.c:686 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "izpusti ŠTEVILO vodilnih komponent iz imen datotek" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "IZRAZ" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 #, fuzzy msgid "ignore case" msgstr "izključitveni vzorci ne razlikujejo med malimi in velikimi črkami" -#: src/tar.c:699 +#: src/tar.c:700 #, fuzzy msgid "patterns match file name start" msgstr "izključitveni vzorci opisujejo celotno ime datoteke" -#: src/tar.c:701 +#: src/tar.c:702 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "" "izključitveni vzorci opisujejo ime datoteke od znaka »/« dalje (privzeto)" -#: src/tar.c:703 +#: src/tar.c:704 #, fuzzy msgid "case sensitive matching (default)" msgstr "" "izključitveni vzorci razlikujejo med malimi in velikimi črkami (privzeto)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "uporabi nadomestne znake (privzeto za izločanje)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "dobesedno ujemanje nizov" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "izključitveni vzorci ne opisujejo »/«" -#: src/tar.c:711 +#: src/tar.c:712 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "izključitveni vzorci opisujejo tudi »/« (privzeto)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Informativni izpisi:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "z izčrpnim izpisom obdelanih datotek" -#: src/tar.c:721 +#: src/tar.c:722 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "izpiši sporočilo, če niso zapisane vse povezave" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2024,27 +2043,27 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "z izpisom časov sprememb datotek v UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "zapiši izčrpno poročilo v DATOTEKO" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "z izpisom zaporednega bloka v arhivu ob vsakem sporočilu" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "vprašaj za potrditev pri vsakem koraku" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "prikaži privzete nastavitve" -#: src/tar.c:745 +#: src/tar.c:746 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " @@ -2053,31 +2072,31 @@ msgstr "" "Pri izpisu seznama ali izvlačenju izpiši vsak imenik, ki ne ustreza iskalnim " "pogojem" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "SLOG" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "nastavi slog navajanja imen; glej spodaj za veljavne SLOGE" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Združljivostne izbire:" -#: src/tar.c:763 +#: src/tar.c:764 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" @@ -2086,57 +2105,57 @@ msgstr "" "pri ustvarjanju arhiva isto kot --old-archive; pri izvlačenju isto kot --no-" "same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Druge izbire:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Naenkrat je dovoljena največ ena od izbir »-Acdtrux«" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Nasprotujoče si izbire glede stiskanja arhiva" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " neznan tip datoteke %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "Datoteke z datumom ni najti" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Nadomeščamo %s za neznan format datuma %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s: datoteka je arhiv; brez iznosa" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2144,115 +2163,111 @@ msgstr "" "\n" "Privzete vrednosti *tega* programa tar:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Neveljaven faktor blokiranja" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Neveljavna dolžina traku" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Več kot en pražni podatek" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Neveljavna skupina" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Podana zaščita ni veljavna" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Neveljavno število" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Neveljaven lastnik" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Neveljavna dolžina zapisa" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Dolžina zapisa mora biti večkratnik %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Neveljavno število elementov" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "Okvarjen argument gostote: »%s«" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "Neznana gostota: »%c«" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[DATOTEKA]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Stara izbira »%c« zahteva argument." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence nima pomena brez seznama datotek" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence ni mogoče uporabiti v zahtevanem načinu delovanja" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Več arhivskih datotek zahteva izbiro »-M«" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Izbire --listed-incremental ni mogoče kombinirati z --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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)" @@ -2261,48 +2276,48 @@ 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Arhivov v več delih ni mogoče preveriti" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Stisnjenega arhiva ni mogoče preveriti" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Stisnjeni arhivi v več delih niso mogoči" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Stisnjenega arhiva ni mogoče ažurirati" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "izbira --pax-option je mogoča le na arhivih POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Zahteva po odprtju praznega arhiva bojazljivo zavrnjena" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Izbire »-Aru« so nezdružljive z »-f -«" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Ena od izbir »-Acdtrux« je obvezna" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2669,6 +2684,9 @@ msgstr "--Predelana imena datotek--\n" msgid "too many arguments" msgstr "" +#~ 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?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "prekliči učinek izbire --delay-directory-restore" diff --git a/po/sv.gmo b/po/sv.gmo index 63569c4..22c997c 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index d7cea56..8229952 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,14 +2,14 @@ # 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 +# Revision: 1.91 # msgid "" msgstr "" -"Project-Id-Version: tar 1.20\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-04-16 17:04+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2008-12-29 11:37+0100\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -82,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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "" @@ -94,15 +94,15 @@ msgstr "" msgid "Unknown system error" msgstr "Okänt systemfel" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "visa denna hjälptext" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "ge ett kort hjälpmeddelande" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "NAMN" @@ -115,11 +115,11 @@ msgstr "ange programnamnet" msgid "SECS" msgstr "SEK" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "vänta i SEK sekunder (standardvärde 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "visa programversion" @@ -316,11 +316,11 @@ msgstr "Ersätter tomt mål för hård länk med \".\"" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "\"" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "\"" @@ -372,10 +372,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -494,6 +495,29 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s och andra.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Rapportera fel till <%s>.\n" +"Rapportera fel eller synpunkter på översättningen till .\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Indatasträng är för lång" @@ -531,16 +555,6 @@ msgstr "" " --version Visa versionsinformation.\n" " --help Visa denna hjälptext.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Rapportera fel till <%s>.\n" -"Rapportera fel eller synpunkter på översättningen till .\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Ogiltigt positioneringsvärde" @@ -565,102 +579,102 @@ msgstr "För tidigt filslut" msgid "Garbage command" msgstr "Okänt kommando" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Summa skrivna byte" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Summa lästa byte" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Summa borttagna byte: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(rör)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Ogiltigt värde på record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Arkivnamn saknas" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Kan inte verifiera standard in/ut-arkiv" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arkivet är komprimerat. Använd flaggan %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Komprimerade arkiv kan inte uppdateras" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Vid bandets början, avslutar nu" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "För många fel, avslutar" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek stannade inte på en postgräns" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: innehåller ogiltigt volymnummer" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Volymnummer flödade över" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Filslut vid förväntat användarsvar" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "VARNING: Arkivet är ofullständigt" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -671,66 +685,66 @@ msgstr "" " q Avsluta programmet\n" " y eller nyrad Fortsätt\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Starta ett underskal\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Skriv denna lista\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Ingen ny volym; avslutar.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Filnamn inte angivet, försök igen.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ogiltig indata. Skriv ? för hjälp.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "kommandot \"%s\" misslyckades" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsätter inte i denna volym" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har fel storlek (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Denna volym kommer inte i rätt ordning" +msgstr "Denna volym kommer inte i rätt ordning (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, 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:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Volym %s överensstämmer inte med %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -738,10 +752,9 @@ 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 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek stannade inte på en postgräns" +msgstr "skrivning stannade inte på en blockgräns" #: src/compare.c:96 #, c-format @@ -754,7 +767,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Oväntat filslut i arkivet" @@ -872,7 +885,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "innehållet inte arkiverat" @@ -901,7 +914,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "katalog inte arkiverad" @@ -995,123 +1008,123 @@ msgstr "Kan inte byta namn på %s till %s" msgid "Error is not recoverable: exiting now" msgstr "Felet kan inte åtgärdas, avslutar nu" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Katalogen har bytt namn från %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Katalogen har bytt namn" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Katalogen är ny" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Ogiltigt värde på tidsvärde" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Ogiltig modifikationstid (sekunder)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Ogiltig modifikationstid (nanosekunder)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Ogiltigt enhetsnummer" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Ogiltigt inodnummer" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Fält för långt när ögonblicksfil lästes" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Läsfel i ögonblicksfil" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Oväntat filslut i ögonblicksfil" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Oväntat fältvärde i ögonblicksfil" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Postavslutare fattas" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Felaktigt filformat för inkrementell säkerhetskopiering" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Formatversion för inkrementell säkerhetskopiering stöds inte: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Felaktig dumpkatalog: förväntade \"%c\" men hittade %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Felaktig dumpkatalog: \"X\" duplicerad" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Felaktig dumpkatalog: tomt namn i \"R\"" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Felaktig dumpkatalog: \"T\" föregås inte av \"R\"" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Felaktig dumpkatalog: tomt namn i \"T\"" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Felaktig dumpkatalog: \"X\" används inte" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan inte skapa temporärkatalog med mall %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Rensar inte katalog: kunde inte ta status" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Tar bort %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan inte ta bort" @@ -1334,87 +1347,87 @@ msgstr "" "annars\n" " never, simple gör alltid enkla säkerhetskopior\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Operationsläge:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "visa innehållet i arkivet" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "extrahera filer från arkivet" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "skapa ett nytt arkiv" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "visa skillnader mellan filsystemet och arkivet" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "lägg till filer på slutet av arkivet" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "lägg till filer som är nyare än de i arkivet" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "lägg till innehållet i en arkivfil till arkivet" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "ta bort från arkivet (inte för arkiv på magnetband!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "verifiera arkivets volymnamn och avsluta." -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Modifiera operationslägen:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "hantera filer med hål mer effektivt" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "ÖVRE[.UNDRE]" -#: src/tar.c:403 +#: src/tar.c:402 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:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "hantera gamla GNU-formatet för inkrementell säkerhetskopiering" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "FIL" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "hantera nya GNU-formatet för inkrementell säkerhetskopiering" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "avsluta inte med felslutstatus p.g.a. oläsbara filer" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMMER" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1426,118 +1439,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "arkivet är sökbart" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "kontrollera inte enhetsnummer när inkrementella arkiv skapas" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" "kontrollera enhetsnummer när inkrementella arkiv skapas (standardvärde)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Kontrollera överskrivning:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "försök verifiera arkivet efter det skapats" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "ta bort filer efter de sparats i arkivet" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "ersätt inte befintliga filer vid extrahering" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "skriv över befintliga filer vid extrahering" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "ta bort befintliga filer innan de nya extraheras" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "töm kataloghierarkier före extrahering av katalog" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "bevara befintliga katalogers metadata" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "skriv över metadata för befintliga kataloger vid extrahering (standardvärde)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Välj utdataström:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "extrahera filer till standard ut" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMMANDO" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "extrahera filer till standard in för ett annat program" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "ignorera barnprocessers slutstatus" -#: src/tar.c:462 +#: src/tar.c:461 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:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Hantering av filattribut:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "sätt NAMN som ägare för adderade filer" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "sätt NAMN som grupp för adderade filer" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATUM-ELLER-FIL" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "RÄTTIGHET" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "sätt (symbolisk) RÄTTIGHET för adderade filer" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METOD" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1547,28 +1560,28 @@ msgstr "" "tiderna efter läsning (METOD=\"replace\", standardvärde) eller genom att " "inte sätta tiderna alls (METOD=\"system\")" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "extrahera inte filers modifieringstid" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "försök extrahera filer med samma ägare som i arkivet" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "extrahera filer med dig själv som ägare" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "använd alltid tal för användar- och gruppnamn" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "extrahera information om filrättigheter (standardvärde för superanvändare)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1576,15 +1589,15 @@ msgstr "" "applicera användarens umask när rättigheter extraheras från arkivet " "(standardvärde för vanliga användare)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "sortera namn som ska extraheras så de passar ihop med arkivet" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "samma som både -p och -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1592,139 +1605,139 @@ msgstr "" "fördröj sättandet av modifikationstider och rättigheter på extraherade " "kataloger till slutet på arkivextraheringen." -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "ta bort effekten av flaggan --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Enhetsval och enhetsbyte:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARKIV" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "använd arkivfil eller enhet ARKIV" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "arkivfilen är lokal även om namnet har kolon" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "använd KOMMANDO istället för rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "använd KOMMANDO istället för rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "ange enhet och densitet" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "skapa/visa/extrahera ett flervolymsarkiv" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "byt band efter det att NUMMER x 1024 byte skrivits" -#: src/tar.c:541 +#: src/tar.c:540 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:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "använd/uppdatera volymnummer i FIL" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Blockhantering:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOCK" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCK x 512 byte per post" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMMER byte per post, multipel av 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorera block med enbart nolltecken (betyder filslut)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "omblocka vid läsning (för 4.2BSD-rör)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Val av arkivformat:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "skapa ett arkiv med givet format" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMAT är ett av följande:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "gammalt V7 format" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU-format enligt tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU-format från tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) format" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) format" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "samma som pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "samma som --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "samma som --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "nyckelord[[:]=värde][,nyckelord[[:]=värde], ...]" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "ange nyckelord för pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "NAMN" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1732,98 +1745,102 @@ msgstr "" "skapa ett arkiv med volymnamnet NAMN. Vid visning/extrahering är NAMN ett " "skalmönster (\"globbing\")" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Komprimeringsflaggor:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "använd arkivsuffix för att bestämma komprimeringsprogram" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" -msgstr "använd arkivsuffix för att bestämma komprimeringsprogram" +msgid "do not use archive suffix to determine the compression program" +msgstr "använd inte arkivsuffix för att bestämma komprimeringsprogram" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "filtrera arkivet genom bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "filtrera arkivet genom gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "filtrera arkivet genom compress" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "filtrera arkivet genom lzma" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "filtrera arkivet genom gzip" +msgstr "filtrera arkivet genom lzop" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "filtrera arkivet genom gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "filtrera genom PROG (måste förstå -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Filval:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "KATALOG" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "byt katalog till KATALOG" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "hämta namn att extrahera från FIL" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T läser namn åtskilda med nolltecken, -C obrukbar" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "ta bort effekten av föregående --null-flagga" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "avcitera filnamn som lästs med -T (standardvärde)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "avcitera inte filnamn som lästs med -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "MÖNSTER" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "utelämna filer som matchar MÖNSTER" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "utelämna filer som matchar mönster i FIL" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1831,87 +1848,87 @@ msgstr "" "utelämna innehållet i kataloger som innehåller CACHEDIR.TAG, förutom " "CACHEDIR.TAG själv" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "utelämna allt i kataloger som innehåller CACHEDIR.TAG" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "utelämna kataloger som innehåller CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "utelämna allting i kataloger som innehåller FIL" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "utelämna kataloger som innehåller FIL" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "uteslut kataloger från versionshanteringssystem" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "gå inte automatiskt ned i kataloger" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "byt inte filsystem när arkivet skapas" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "gå rekursivt ned i kataloger (standardvärde)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "tag inte bort inledande \"/\" från namn" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "NAMN" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "börja med fil NAMN i arkivet" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "arkivera bara filer nyare än DATUM-ELLER-FIL" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATUM" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "jämför datum och tid endast för dataändringar" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "KONTROLL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "gör säkerhetskopior före borttagning, välj typ av versionshantering" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "STRÄNG" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1920,91 +1937,91 @@ msgstr "" "säkerhetskopieändelsen (\"~\" om inte ändrad med miljövariabeln " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Filnamnstransformationer:" -#: src/tar.c:685 +#: src/tar.c:686 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "UTTRYCK" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "använd seds ersättnings-UTTRYCK för att transformera filnamn" -#: src/tar.c:694 +#: src/tar.c:695 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:697 +#: src/tar.c:698 msgid "ignore case" msgstr "matcha gemener och versaler lika" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "mönster måste matcha i början på filnamn" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "mönster matchas efter \"/\" i filnamn (standardvärde vid uteslutning)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "matcha gemener och versaler olika (standardvärde)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "använd jokertecken (standardvärde för uteslutning)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "ordagrann strängjämförelse" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "jokertecken matchar inte \"/\"" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "jokertecken matchar \"/\" (standardvärde för uteslutning)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Informativ utskrift:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "visa namn på alla filer som behandlas" -#: src/tar.c:721 +#: src/tar.c:722 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "ÅTGÄRD" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "utför ÅTGÄRD vid vare kontrollpunkt" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "visa ett meddelande om inte alla länkar arkiverats" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2015,27 +2032,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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "visa filers modifieringstid i UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "skicka informativa meddelanden till FIL" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "visa blocknummer inom arkivet för varje meddelande" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "fråga efter bekräftelse för varje steg" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "visa standardvärden för \"tar\"" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2043,31 +2060,31 @@ msgstr "" "vid visning eller extrahering, visa varje katalog som inte matchar " "sökkriterium" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "visa fil- eller arkivnamn efter transformering" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STIL" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "citera även tecken i STRÄNG" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "citera inte tecken i STRÄNG" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Kompatibilitetsflaggor:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2075,56 +2092,56 @@ msgstr "" "vid skapande, samma som --old-archive. Vid extrahering, samma som --no-same-" "owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Andra flaggor:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "begränsa användningen av eventuellt farliga flaggor" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Du kan endast ange en av flaggorna \"-Acdtrux\"" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Motstridiga komprimeringsflaggor" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Okänt signalnamn: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Tidsfil hittades inte" -#: src/tar.c:1017 +#: src/tar.c:1018 #, 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:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Flagga %s: Tolkar tidsangivelse \"%s\" som %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: fillistan redan läst" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: filnamnet som lästes innehåller nolltecken" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Giltiga argument till flaggan --quoting-style är:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2132,165 +2149,163 @@ msgstr "" "\n" "*Denna* tar har standardvärdena:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Ogiltig blockfaktor" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Ogiltig bandlängd" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Mer än en datumgräns" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Ogiltig version för filer med hål" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' stöds inte på denna plattform" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "--checkpoint-värdet är inte ett heltal" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Ogiltig grupp" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Ogiltiga rättigheter givna för flagga" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Ogiltigt nummer" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Ogiltig ägare" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"Flaggan --preserve är föråldrad, använd --preserve-permissions --preserve-" +"order istället" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Ogiltig poststorlek" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Poststorlek måste vara en multipel av %d" -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Ogiltig antal element" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Endast en --to-command flagga tillåten" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Ogiltig densitetsangivelse: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Okänd densitet: \"%c\"" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FIL]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Gammal flagga \"%c\" kräver ett argument" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence är meningslöst utan en fillista" -#: src/tar.c:2241 +#: src/tar.c:2240 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:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Multipla arkivfiler kräver \"-M\" flaggan" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Kan inte kombinera --listed-incremental med --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Flervolymsarkiv kan inte verifieras" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Komprimerade arkiv kan inte verifieras" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Kan inte använda komprimerade flervolymsarkiv" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Komprimerade arkiv kan inte slås samman" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option kan bara användas på POSIX-arkiv" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "Volymlängden kan inte vara mindre än poststorleken" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "--preserve-order är inte kompatibel med --listed-incremental" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Vägrar fegt att skapa ett tomt arkiv" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "Flaggorna \"-Aru\" är inkompatibla med \"-f -\"" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Du måste ange en av flaggorna \"-Acdtrux\"" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Avslutar med felstatus på grund av tidigare fel" #: src/update.c:86 #, c-format @@ -2551,12 +2566,12 @@ msgstr "status (stat) kunde ej tas på %s" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "begärd fillängd %lu, verklig %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "skapad fil har inte hål" #: tests/genfile.c:353 #, c-format @@ -2647,9 +2662,5 @@ msgstr "--stat kräver filnamn" 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" +#~ 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?" diff --git a/po/tar.pot b/po/tar.pot index 3b9829f..0e60492 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "" @@ -311,11 +311,11 @@ msgstr "" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "" @@ -370,7 +370,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -467,6 +467,26 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -498,13 +518,6 @@ msgid "" " --help Output this help.\n" msgstr "" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "" @@ -529,102 +542,102 @@ msgstr "" msgid "Garbage command" msgstr "" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "" -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -632,71 +645,71 @@ msgid "" " y or newline Continue operation\n" msgstr "" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1619 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" msgstr "" @@ -711,7 +724,7 @@ msgstr[1] "" msgid "Contents differ" msgstr "" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "" @@ -829,7 +842,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -858,7 +871,7 @@ msgstr "" msgid "%s: File removed before we read it" msgstr "" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "" @@ -952,122 +965,122 @@ msgstr "" msgid "Error is not recoverable: exiting now" msgstr "" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "" @@ -1268,86 +1281,86 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1355,561 +1368,565 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "" -#: src/tar.c:612 +#: src/tar.c:611 msgid "filter the archive through lzop" msgstr "" #: src/tar.c:613 -msgid "PROG" +msgid "filter the archive through xz" msgstr "" #: src/tar.c:614 +msgid "PROG" +msgstr "" + +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1917,273 +1934,269 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1369 -msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" -msgstr "" - -#: src/tar.c:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "" -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "" -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" diff --git a/po/tr.gmo b/po/tr.gmo index 324336c..d19ac16 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index bead061..0abdde8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: tar 1.18\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" "PO-Revision-Date: 2007-07-09 11:30+0300\n" "Last-Translator: Nilgün Belma Bugüner \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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "bu yardım iletisi gösterilir" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "kısa bir kullanım iletisi gösterilir" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: 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:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "SANİYE saniye bekler (öntanımlı 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "sürüm bilgisi gösterilir" @@ -316,11 +316,11 @@ msgstr "Boş sabit bağ hedefi için `.' ikamesi" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -375,7 +375,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -472,6 +472,29 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Yazılım hatalarını <%s> adresine,\n" +"çeviri hatalarını adresine bildiriniz.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Girdi dizgesi çok uzun" @@ -508,16 +531,6 @@ msgstr "" " --version Sürümü basar.\n" " --help Bu iletiyi basar.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Yazılım hatalarını <%s> adresine,\n" -"çeviri hatalarını adresine bildiriniz.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Arama başlangıcı hatası" @@ -542,102 +555,102 @@ msgstr "Dosya sonu belirsiz" msgid "Garbage command" msgstr "Bozuk komut" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Yazılan toplam bayt" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Okunan toplam bayt" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Silinen toplam bayt: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(boru)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "record_size için geçersiz değer" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Arşiv ismi verilmemiş" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "stdG/stdÇ arşivi doğrulanamaz" -#: src/buffer.c:536 +#: src/buffer.c:538 #, 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:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Sıkıştırılmış arşivler güncellenemez" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Bandın başlangıcında, şimdilik çıkıyor" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Çok hata var, çıkıyor" -#: src/buffer.c:695 +#: src/buffer.c:697 #, 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:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek bir kaydın sınırında durmadı" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: geçersiz bölüm numarası içeriyor" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Bölüm numarası kapsamdışı" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Kullanıcı cevabı beklenirken dosya sonuna gelindi" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "UYARI: Arşiv eksik" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -648,72 +661,72 @@ msgstr "" " q Uygulama sonlandırılır\n" " y veya İşlem sürdürülür\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! bir alt kabuk açılır\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Bu listeyi basar\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Yeni bölüm yok; çıkıyor.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Dosya ismi belirtilmemiş. Tekrar deneyin.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Girdi geçersiz, Yardım için ? yazın.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "%s komutu başarısız" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s bu bölümde devam etmiyor" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s yanlış uzunluk (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Bu bölüm sıralama dışı" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Arşiv etiketi %s ile eşleşmiyor" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "%s bölümü %s ile eşleşmiyor" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, 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 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek bir kaydın sınırında durmadı" @@ -729,7 +742,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Arşivde beklenmeyen dosya sonu" @@ -848,7 +861,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "içerik dökümlenmedi" @@ -877,7 +890,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "dizin dökümlenmedi" @@ -971,122 +984,122 @@ msgstr "%s ismi %s olarak değiştirilemez" msgid "Error is not recoverable: exiting now" msgstr "Hata kurtarılabilir değil: şimdilik çıkılıyor" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Dizinin eski adı %s idi" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Dizin adı değiştirilmişti" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Dizin yeni" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Geçersiz zaman damgası" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Değişiklik zamanı (saniye cinsinden) geçersiz" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Değişiklik zamanı (nanosaniye cinsinden) geçersiz" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Geçersiz aygıt numarası" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Geçersiz düğüm numarası" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "Anlık görüntü dosyası okunurken alan çok uzun" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Anlık görüntü dosyasında okuma hatası" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Anlık görüntü dosyasında beklenmeyen dosya sonu" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Anlık görüntü dosyasında beklenmeyen alan değeri" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Kayıt sonlandırıcı eksik" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Arttırımlı dosya biçimi hatalı" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Desteklenmeyen arttırımlı biçim sürümü: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir bozuk: umulan '%c' ama bulunan %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir bozuk: 'X' yinelenmiş" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir bozuk: 'R'deki isim boş" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir bozuk: 'T' 'R' ile öncelenmemiş" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir bozuk: 'T'deki isim boş" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir bozuk: umulan'%c' ama bulunan veri sonu" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir bozuk: 'X' hiç kullanılmamış" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s şablonu kullanılarak geçici dizin oluşturulamıyor" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: dizin temizlenmiyor: durumlama yapılamadı" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: dizin farklı bir aygıtta: temizlenmiyor" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s siliniyor\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kaldırılamaz" @@ -1308,86 +1321,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:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Ana işlem kipi:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "bir arşiv içeriğini listeler" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "bir arşivdeki dosyaları çıkarır" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "yeni bir arşiv oluşturur" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "arşiv ile dosya sistemi arasındaki farklar bulunur" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "dosyaları arşivin sonuna ekler" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "sadece arşivdeki kopyasından daha yeni dosyalar eklenir" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "bir arşive tar dosyaları ekler" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "arşivden siler (teyplerde değil!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "arşiv bölüm etiketini sınar ve çıkar" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "İşlem değiştiriciler:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "seyrek dosyalar verimli şekilde elde edilir" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "ANA[.ALT]" -#: src/tar.c:403 +#: src/tar.c:402 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:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "GNU eski tarz arttırımlı yedekleme tanınır" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "DOSYA" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "GNU yeni tarz arttırımlı yedekleme tanınır" -#: src/tar.c:409 +#: src/tar.c:408 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:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "SAYI" -#: src/tar.c:411 +#: src/tar.c:410 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 +1412,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:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "arşiv arama yapılabilen türde" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Üsteyazma denetimi:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "yazdıktan sonra arşivi doğrulamaya çalışır" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "arşive eklendikten sonra dosyalar silinir" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "çıkarılırken mevcut dosyalar değiştirilmez" -#: src/tar.c:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "çıkarılırken mevcut dosyaların üzerine yazılır" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "çıkarılmadan önce mevcut dosya silinir" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "dizin çıkarılmadan önce alt dizinleri silinir" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "mevcut dizinlerin öznitelikleri korunur" -#: src/tar.c:447 +#: src/tar.c:446 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:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Çıktı akımını seçiniz:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "dosyalar standart çıktıya çıkarılır" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "KOMUT" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "çıkarılan dosyaları başka bir uygulamaya borular" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "altsüreçlerin çıkış kodları yoksayılır" -#: src/tar.c:462 +#: src/tar.c:461 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:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Dosya özniteliklerinin elde edilmesi:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "İSİM eklenen dosyaların sahibi yapılır" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "İSİM eklenen dosyaların grubu yapılır" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DOSYA-TARİHİ" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "KİP" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "KİP eklenen dosyaların (sembolik) kipi yapılır" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "YÖNTEM" -#: src/tar.c:479 +#: src/tar.c:478 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,28 +1532,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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "dosya değişiklik zamanı çıkarılmaz" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "sahibi aynı olan dosyalar çıkarılmaya çalışılır" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "dosyalar sizin sahipliğinizde çıkarılır" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "kullanıcı/grup isimleri yerine daima numaraları kullanılır" -#: src/tar.c:491 +#: src/tar.c:490 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:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1548,15 +1561,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:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "isimler arşivdeki sırasına göre çıkarılır" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "-p ve -s birlikte verilmiş gibi olur" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1564,139 +1577,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:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore seçeneğinin etkisi iptal edilir." -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Aygıt seçimi ve aygıt değiştirme:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARŞİV" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "arşiv dosyası ya da ARŞİV aygıtı kullanılır" -#: src/tar.c:515 +#: src/tar.c:514 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:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "rmt yerine rmt KOMUT kullanılır" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "rsh yerine uzak uçta KOMUT kullanılır" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "sürücü ve yoğunluk belirtilir" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "çok bölümlü arşivi oluşturur/listeler/çıkarır" -#: src/tar.c:539 +#: src/tar.c:538 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:541 +#: src/tar.c:540 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:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "DOSYAda bölüm numarası kullanılır/güncellenir" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Aygıtın blok düzeni:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOK" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "kayıt başına BLOK x 512 bayt" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "512'nin katları olarak kayıt başına BOYUT bayt" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "arşivdeki sıfırlı bloklar yoksayılır (dosyasonu anlamında)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "okunmuş olarak yeniden bloklanır (4.2 BSD boruları için)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Arşiv biçimi seçimi:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "BİÇİM" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "belirtilen biçimin arşivi oluşturulur." -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "BİÇİM şunlardan biri olabilir:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "eski V7 tar biçimi" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 için GNU biçimi" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x biçimi" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) biçimi" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) biçimi" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "pax ile aynı" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr " --format=v7 ile aynı" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "--format=posix ile aynı" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "isim[[:]=değer][,isim[[:]=değer]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "pax anahtar sözcüklerini denetler" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "METİN" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1704,189 +1717,194 @@ 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:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "Sıkıştırma seçenekleri çelişiyor" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "arşivi bzip2 üzerinden geçirir" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "arşivi gzip üzerinden geçirir" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "arşivi compress üzerinden geçirir" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "arşivi gzip üzerinden geçirir" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "arşivi gzip üzerinden geçirir" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "arşivi gzip üzerinden geçirir" + +#: src/tar.c:614 msgid "PROG" msgstr "UYG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "arşivi UYG üzerinden geçirir (UYG -d kabul etmeli)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Yerel dosya seçimi:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "DİZİN" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "DİZİN dizinine geçilir" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "çıkarılacak ya da oluşturulacak isimler DOSYAdan alınır" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T boş karakter sonlandırmalı isimleri okur, -C iptal edilir" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "-T ile okunan dosyaisimlerine tırnak ayıklama uygulanır" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "-T ile okunan dosyaisimlerine tırnak ayıklama uygulanmaz" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "ŞABLON" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "belirtilen ŞABLONa uyan dosyalar hariç tutulur" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "DOSYAdaki şablonlara uyan isimler hariç tutulur" -#: src/tar.c:640 +#: src/tar.c:641 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:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG içeren dizinlerin altındaki herşey hariç tutulur" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG içeren dizinler hariç tutulur" -#: src/tar.c:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "DOSYA içeren dizinlerin altındaki herşey hariç tutulur" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "DOSYA içeren dizinler hariç tutulur" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "dizinlerde özdevinimli olarak azalan sıralamadan kaçınılır" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "arşiv oluşturulurken yerel dosya sisteminde kalınır" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "dizinlerin alt dizinlerine inilir (öntanımlı)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "dosya isimlerinin başındaki `/'lar ayrılmaz" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 #, 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "ÜYE-İSMİ" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "arşivin ÜYE-İSMİ üyesinden başlanır" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "sadece DOSYA-TARİHİnden daha yeni dosyalar saklanır" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "TARİH" -#: src/tar.c:674 +#: src/tar.c:675 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:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "DENETİM" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "kaldırılmadan önce DENETİM sürümü seçilerek yedeklenir" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "DİZGE" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1894,89 +1912,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:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Dosya ismi dönüşümleri:" -#: src/tar.c:685 +#: src/tar.c:686 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "İFADE" -#: src/tar.c:688 +#: src/tar.c:689 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:694 +#: src/tar.c:695 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:697 +#: src/tar.c:698 msgid "ignore case" msgstr "harf büyüklükleri önemsenmez" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "dosya isminin başlangıcına uyan kalıplar" -#: src/tar.c:701 +#: src/tar.c:702 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:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "harf büyüklüklerine duyarlı eşleşme (öntanımlı)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "genelleme kalıpları kullanılır (dışlama için öntanımlı)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "birebir dizge eşleme" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "'/' ile eşleşmeyen genelleme kalıpları" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "'/' ile eşleşen genelleme kalıpları (dışlama için öntanımlı)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Bilgilendirme çıktısı:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "işlenen dosyalar ayrıntılı listelenir" -#: src/tar.c:721 +#: src/tar.c:722 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 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:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SiNYAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1987,113 +2005,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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "dosya değişiklik zamanları UTC'ye göre basılır" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "ayrıntılı çıktı DOSYAya gönderilir" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "her iletide arşiv içindeki blok sayısı gösterilir" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "her eylemden önce doğrulama istenir" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "tar öntanımlıları gösterilir" -#: src/tar.c:745 +#: src/tar.c:746 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:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "dönüşümden sonra dosya ve arşiv isimlerini gösterir" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "ŞEKİL" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "DİZGEdeki sarmalama karakterlerine ek olarak" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "DİZGEdeki karakterler için sarmalamayı iptal eder" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Uyumluluk seçenekleri:" -#: src/tar.c:763 +#: src/tar.c:764 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:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Diğer seçenekler:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "bozuculuk olasılığı olan bazı seçeneklerin kullanımı iptal edilir" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "`-Acdtrux' seçenekleri birden fazla belirtilemez" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Sıkıştırma seçenekleri çelişiyor" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Bilinmeyen sinyal ismi: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Tarih örnekleri dosyası bulunamadı" -#: src/tar.c:1017 +#: src/tar.c:1018 #, 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:1042 +#: src/tar.c:1043 #, 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:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: dosya listesi zaten okundu" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: okunan dosya ismi boş karakter içeriyor" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style seçeneği için geçerli değerler:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2101,162 +2119,158 @@ msgstr "" "\n" "*Bu* tar için öntanımlılar:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Bloklama çarpanı geçersiz" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Kayıt ortamının uzunluğu geçersiz" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Birden fazla eşik tarihi" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Seyrek sürüm değeri geçersiz" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' seçeneği bu platformda desteklenmiyor" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "--checkpoint değeri bir tamsayı değil" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: geçersiz grup" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Seçenekte verilen kip geçersiz" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Sayı geçersiz" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Sahip geçersiz" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Kayıt uzunluğu geçersiz" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Kayıt uzunluğu %d nin katları olmalı" -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Elemen sayısı geçersiz" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Sadece tek bir --to-command seçeneği kullanılabilir" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Hatalı yoğunluk argümanı: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Bilinmeyen yoğunluk: '%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[DOSYA]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Eski seçenek `%c' bir argümanla kullanılır." -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence bir dosya listesi olmaksızın anlamlı değil" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence istenen işlem kipinde kullanılamaz" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Çok sayıda arşiv dosyası `-M' seçeneği gerektirir" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "--listed-incremental ile --newer birlikte kullanılamaz" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Çok sayıda bölüm içeren arşivler doğrulanamaz" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Sıkıştırılmış arşivler doğrulanamaz" -#: src/tar.c:2314 +#: src/tar.c:2313 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:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Sıkıştırılmış arşivler birleştirilemez" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option sadece POSIX arşivlerinde kullanılabilir" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Bir boş arşivin oluşturulması ister istemez reddediliyor" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "`-Aru' seçenekleri `-f -' ile uyumsuz" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "`-Acdtrux' seçeneklerinden biri belirtilmeli" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2616,6 +2630,10 @@ msgstr "--stat seçeneği dosya isimleri gerektirir" msgid "too many arguments" msgstr "argüman sayısı çok fazla" +#~ 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?" + #, fuzzy #~ msgid "cancel effect of the previous --transform-links option" #~ msgstr "--delay-directory-restore seçeneğinin etkisi iptal edilir." diff --git a/po/uk.gmo b/po/uk.gmo index 0f1ce5a..3a71e8d 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 4bd3717..80ccf0e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,13 +1,14 @@ # Ukrainian messages for GNU tar +# This file is distributed under the same license as the tar package. # Copyright (C) 2008 Free Software Foundation, Inc. # Sergey Poznyakoff , 2005, 2006, 2007, 2008. # msgid "" msgstr "" -"Project-Id-Version: tar 1.19.90\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-02-21 19:59+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2008-12-28 16:01+0200\n" "Last-Translator: Sergey Poznyakoff \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" @@ -81,7 +82,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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "Про помилки звітуйте на <%s>.\n" @@ -90,15 +91,15 @@ msgstr "Про помилки звітуйте на <%s>.\n" msgid "Unknown system error" msgstr "Невідома системна помилка" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "вивести цю довідку" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "вивести коротке повідомлення про використання" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "НАЗВА" @@ -111,11 +112,11 @@ msgstr "встановити назву програми" msgid "SECS" msgstr "СЕКУНДИ" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "зачекати вказану кількість секунд (типово 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "вивести версію програми" @@ -315,11 +316,11 @@ msgstr "Підстановка `.' замість пустої назви ціл #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -371,10 +372,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -492,6 +494,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s та інші.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Про помилки звітуйте на <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "За довгий вхідний рядок" @@ -528,15 +552,6 @@ msgstr "" " --version Вивести версію програми та вийти.\n" " --help Вивести цю довідку\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Про помилки звітуйте на <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Зміщення за межами діапазону" @@ -561,58 +576,58 @@ msgstr "Передчасне закінчення файла" msgid "Garbage command" msgstr "Хибна команда" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Записано загалом" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Прочитано байтів загалом" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Видалено загалом: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Недійсне значення record_size" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Не вказано назви архіву" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Неможливо перевіряти архів, записаний до stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Архів стиснений. Використовуйте опцію %s" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Не можна оновлювати стиснені архіви" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "На початку стрічки, закінчуємо" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Надто багато помилок, виконання перервано" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -620,7 +635,7 @@ msgstr[0] "Розмір запису = %lu блок" msgstr[1] "Розмір запису = %lu блоки" msgstr[2] "Розмір запису = %lu блоків" -#: src/buffer.c:716 +#: src/buffer.c:718 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -628,39 +643,39 @@ msgstr[0] "Невірне вирівнювання блоку (%lu байт) в msgstr[1] "Невірне вирівнювання блоку (%lu байти) в архіві" msgstr[2] "Невірне вирівнювання блоку (%lu байтів) в архіві" -#: src/buffer.c:793 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Не вдалося переміститись назад у архіві; можливо архів не можна прочитати " "без опції -i" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не зупинився на межі запису" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: містить невірний номер тому" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Переповнення номера тому" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Підготуйте том #%d архіву %s ї натиснить return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "Кінець файлу, замість очікуваної відповіді" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "ПОПЕРЕДЖЕННЯ: Незавершений архів" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -671,66 +686,66 @@ msgstr "" " q Перервати роботу\n" " у або новий рядок Продовжувати\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Викликати оболонку\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? Вивести цю довідку\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Новий том відсутній. Завершення.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "Не вказано назви файлу. Спробуйте ще раз.\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Недійсні вхідні дані. Наберіть ? щоб отримати підказку.\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "збій виконання `%s'" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s можливо продовжується у цьому томі: заголовок містить обрізану назву" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продовжується у цьому томі" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s є неправильним розміром (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Цей том є за межами послідовності" +msgstr "Цей том є за межами послідовності (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "Назви тому відсутня в архіві. Не можна порівняти з %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Етикетка тому %s не співпадає з %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -738,10 +753,9 @@ msgstr "" "%s: назва файлу надто довга щоб зберегти її у заголовку тому GNU; назву " "обрізано" -#: src/buffer.c:1619 -#, fuzzy +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek не зупинився на межі запису" +msgstr "запис не закінчився на межі блоку" #: src/compare.c:96 #, c-format @@ -755,7 +769,7 @@ msgstr[2] "Вдалося прочитати тільки %lu з %lu байті msgid "Contents differ" msgstr "Різниця у змісті" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "Неочікуваний кінець файла в архіві" @@ -876,7 +890,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "вміст не архівується" @@ -905,7 +919,7 @@ msgstr "%s: файл є архівом; не архівується" msgid "%s: File removed before we read it" msgstr "%s: Файл було видалено перед тим як tar встиг його прочитати" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "каталог не архівується" @@ -1001,124 +1015,124 @@ msgstr "Не вдається перейменувати %s на %s" msgid "Error is not recoverable: exiting now" msgstr "Невиправна помилка: завершення роботи" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Каталог перейменовано з %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Каталог перейменовано" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Новий каталог" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Невірний час файлу" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Невірна дата модифікації (секунди)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Недійсний час модифікації (наносекунди)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Невірний номер пристрою" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Невірний номер і-вузла" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "З файла-знімка прочитано надто довге поле" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Помилка читання файла-знімка" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "Неочікуваний кінець файла-знімка" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "Неочікуваний кінець файла-знімка" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Бракує ознаки кінця запису" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Неправильний формат файла знімку" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "Такий інкрементний формат не підтримується: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Неправильно сформований dumpdir: очікувалося '%c' натомість знайдено %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Неправильно сформований dumpdir: 'X' вказаний двічі" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Невірний формат dumpdir: пуста назва у `R'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Невірний формат dumpdir: `T' без попереднього `R'" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Невірний формат dumpdir: пуста назва у `T'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Невірний формат dumpdir: очікувалося `%c', натомість знайдено кінець файла" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Невірний формат dumpdir: `X' не використаний" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Не вдається створити тимчасовий каталог використовуючи шаблон %s" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не очищується: не вдалося виконати stat" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог знаходиться на іншому пристрої: не очищується" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Стирання %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Не вдається видалити" @@ -1346,88 +1360,88 @@ msgstr "" " інакше - прості\n" " never, simple завжди створювати прості резервні копії\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Режими роботи:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "вивести вміст архіву" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "витягнути файли з архіву" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "створити новий архів" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "порівняти файли в архіві з файлами у файлової системі" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "долучити файли до існуючого архіву" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "долучати тільки такі файли, що є новішими за їх копії в архіві" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "долучити архів до архіву" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "видалити файли з архіву (не на стрічці!)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "перевірити мітку тому та вийти" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Модифікатори режиму роботи:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "заощаджувати простір під час зберігання розсіяних файлів" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "ГОЛОВНИЙ[.ДРУГОРЯДНИЙ]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "встановлює версію формату розсіяних файлів (вмикає --sparse)" # FIXME: incremental -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "обробка старого формату інкрементного архіву GNU" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "ФАЙЛ" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "обробка нового формату інкрементного архіву GNU" # FIXME: хммм... -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "ігнорувати помилки читання файлів" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "ЧИСЛО" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1439,118 +1453,119 @@ msgstr "" "з переліком файлів (у командному рядку або за допомогою опції -T). Типове " "ЧИСЛО: 1." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "архів підтримує операцію seek" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" -msgstr "" +msgstr "не перевіряти номери пристрою під час створювання інкрементних архівів" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" +"перевіряти номери пристрою під час створювання інкрементних архівів (типово)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Керування перезаписом:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "перевірити архів після запису в нього" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "видаляти файли після додавання до архіву" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "не заміняти існуючи файли під час витягування" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "не заміняти існуючи файли що є новішими за їх копії у архіві" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "перезаписувати існуючі файли під час витягування" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "видаляти кожний файл перед витягуванням його копії" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "спорожняти старий каталог перед витягуванням його копії з архіву" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "зберігати мета-дані існуючих каталогів" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "перезаписувати метадані існуючих каталогів під час витягування (типово)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Вибір вихідного потоку:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "витягувати файли у стандартний вивід" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "КОМАНДА" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "передавати витягнуті файли до стандартного вводу іншої програми" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "ігнорувати коди завершення процесів-нащадків" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "вважати ненульовий код завершення нащадка помилкою" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Обробка атрибутів файлу:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "встановлення вказаного користувача власником доданих файлів" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "встановлення групи з вказаною назвою групою власника доданих файлів" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "ДАТА-АБО-ФАЙЛ" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "встановлення часу останньої зміни доданих файлів" # Ну, і чому це CHANGES?? -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "ПРАВА" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "встановлення вказаних символічно прав доступу для доданих файлів" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:479 +#: src/tar.c:478 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 " @@ -1560,29 +1575,29 @@ msgstr "" "читання (типово, МЕТОД='replace'), або через запобігання оновленню часу " "(МЕТОД='system')" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "не витягувати час модифікації файлів" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "витягувати назву власника файлів" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "стати власником витягнутих файлів" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "завжди використовувати числа замість назв власника/групи" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" "встановлювати права доступу згідно з даними архіву (типово для супер-" "користувача)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1590,15 +1605,15 @@ msgstr "" "встановлювати права доступу згідно зі значенням umask (типово для звичайного " "користувача)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "витягувати файли у порядку їх з'явлення в архіві" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "те ж, що -p -s разом" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1606,139 +1621,139 @@ msgstr "" "затримати встановлення часу модифікації та прав доступу до каталогів до " "кінця витягування" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "відмінити дії опції --delay-directory-restore" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Вибір та зміна пристрою:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "АРХІВ" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "використовувати вказаний файл або пристрій" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "файл архіву є локальним, навіть якщо його назва містить двокрапку" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "використовувати вказану команду замість rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "використовувати вказану команду замість rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "визначає пристрой та густину" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "створити, виводити зміст або витягувати файли з багатотомного архіву" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "змінити стрічку після запису ЧИСЛА x 1024 байтів" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "запускати сценарій наприкінці кожної стрічки (вмикає -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "використовувати/обновляти номер тому у ФАЙЛІ" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Блокування пристрою:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "ЧИСЛО-БЛОКІВ" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "розмір запису ЧИСЛО-БЛОКІВ x 512 байтів" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "встановити розмір запису у блоках по 512 байтів" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ігнорувати нульові блоки в архіві (звичайно вказують кінець файлу)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "розбивати на блоки під час читання (для каналів 4.2BSD)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Вибір формату архіву:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "ФОРМАТ" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "створити архів у вказаному форматі" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "ФОРМАТ будь-який з наступних:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "старий формат V7" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "формат GNU, сумісний з версією tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "формат GNU, сумісний з версією tar 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "те ж, що і pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "те ж, що і --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "те ж, що і --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ключове_слово[[:]=значення][,ключове_слово[[:]=значення], ...]\"" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "керування ключовими словами pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1746,99 +1761,103 @@ msgstr "" "створити архів з назвою тому \"ТЕКСТ\". Під час виводу змісту або " "витягування, використовувати ТЕКСТ як шаблон пошуку тому" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Опції стиснення:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "вибирати програму стиснення за суфіксом архіву" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" -msgstr "вибирати програму стиснення за суфіксом архіву" +msgid "do not use archive suffix to determine the compression program" +msgstr "не використовувати суфікс для вибору програми стиснення" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "використовувати bzip2 для стиснення/розтискання архіву" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "використовувати gzip для стиснення/розтискання архіву" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "використовувати compress для стиснення/розтискання архіву" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "використовувати lzma для стиснення/розтискання архіву" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "використовувати gzip для стиснення/розтискання архіву" +msgstr "використовувати lzop для стиснення/розтискання архіву" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "використовувати gzip для стиснення/розтискання архіву" + +#: src/tar.c:614 msgid "PROG" msgstr "ПРОГРАМА" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "використовувати ПРОГРАМУ для стиснення/розтискання архіву" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Вибір файлів:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "долучити ФАЙЛ до архіву (корисне, якщо його назва починається з -)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "КАТАЛОГ" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "перейти до вказаного каталогу" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "читати назви файлів для додання/витягування з вказаного файла" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "" "файл, вказаний з опцією -T, містить назви, відокремлені нульовими символами. " "Ця опція вимикає -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "відмінити дію попередньої опції --null" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "усувати цитування з назв файлів прочитаних за допомогою -T (типово)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "не усувати цитування з назв файлів прочитаних за допомогою -T" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "ШАБЛОН" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "не обробляти файли, назви яких відповідають вказаному шаблону" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "виключити назви що відповідають шаблонам, вказаним у файлі" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1846,88 +1865,88 @@ msgstr "" "не архівувати файли в каталогах, що містять CACHEDIR.TAG, з винятком самого " "файлу" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "не архівувати жодні файли в каталогах, що містять CACHEDIR.TAG" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "не архівувати каталоги, що містять CACHEDIR.TAG" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "не архівувати файли в каталогах, що містять ФАЙЛ, з винятком самого файлу" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "не архівувати жодні файли в каталогах, що містять ФАЙЛ" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "не архівувати каталоги, що містять ФАЙЛ" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "не архівувати каталоги систем керування версіями" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "не заходити автоматично у каталоги" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "залишатися у локальної файлової системі під час створення архіву" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "рекурсивно проходити каталоги (типово)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "не видаляти початкову косу риску `/' з назв файлів" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "Йти за символьними посиланнями: долучати файли, на яки вони вказують" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "Йти за жорсткими посиланнями: долучати файли, на яки вони вказують" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "НАЗВА-ФАЙЛУ" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "починати обслуговування архіву з вказаного файлу" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "долучати тільки такі файли, що є новіші за вказану дату або файл" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "ДАТА" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "порівнювати тільки дату і час зміни даних" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "РЕЖИМ" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "перед видаленням створювати резервні файли у вказаному режимі" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "РЯДОК" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1935,90 +1954,90 @@ msgstr "" "перед видаленням створювати резервні файли з указаним суфіксом (типово '~', " "якщо не перевизначено змінною середовища SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Перетворювання назв файлів:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "видаляти вказане ЧИСЛО компонентів з початку назв файлів" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "ВИРАЗ" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "перетворювати назви файлів за допомогою вказаного виразу заміни" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Керування порівнюванням назв (впливає на взірці як вилучення, так і " "долучення):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "шаблони ігнорують відмінності у регістрі символів" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "порівнювати шаблони з назвами файлів починаючи від початку назви" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "" "порівнювати шаблони з назвами файлів починаючи від будь-якого / (типово)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "шаблони враховують регістр (типово)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "користатися шаблонами (типово для вилучення)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "порівнювати назви буквально" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "шаблони не стосуються до '/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "шаблони стосуються до '/' (типово)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Інформативний вивід:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "виводити докладну інформацію про оброблені файли" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "виводити контрольне повідомлення кожне ЧИСЛО записів (типово 10)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "ДІЯ" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "виконати вказану дію у контрольному пункті" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "виводити повідомлення якщо до архіву було додано не всі посилання" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "СИГНАЛ" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2029,27 +2048,27 @@ msgstr "" "- друкувати статистику по отриманню цього сигналу; дозволеними сигналами є " "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 і SIGUSR2, а також ці назви без префікса SIG" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "друкувати час модифікації файлів у UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "виводити детальну інформацію у ФАЙЛ" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "попереджувати кожне повідомлення номером блоку в архіві" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "Запитувати підтвердження кожної дії" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "вивести типові налаштування" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2057,31 +2076,31 @@ msgstr "" "під час виведення змісту або витягування файлів друкувати назви каталогів що " "не відповідають критеріям пошуку" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "показувати перетворені назви файлів" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "встановити стиль цитування; дозволені стилі див. нижче" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "цитувати також вказані символи" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "вимкнути цитування вказаних символів" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Опції сумісності:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2089,56 +2108,56 @@ msgstr "" "під час створення архіву, те ж саме, що і --old-archive. Під час " "витягування, те ж саме, що --no-same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Інші опції:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "заборонити користування деякими потенційно небезпечними опціями" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "Не можна вказувати більш ніж одну з опцій `-Acdtrux'" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Опції стиснення конфліктують одна з другою" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Невідомий тип файла %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "Не знайдено файл-зразок дати" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Використовується %s замість невідомого формату дати %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "Опція %s: Дату `%s' сприйнято як %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: перелік файлів уже прочитано" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: прочитана назва файла містить нульовий символ" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "Допустимими аргументами опції --quoting-style є:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2146,117 +2165,114 @@ msgstr "" "\n" "Типові налаштування *цієї* копії програми:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Неправильний фактор блокування" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Неправильна довжина стрічки" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Більш ніж одна гранична дата" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Недійсна версія формату розсіяних файлів" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "опція --atime-preserve='system' не підтримується на цій платформі" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "аргумент --checkpoint мусить бути цілим числом" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Невірна група" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Невірний формат прав доступу" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Невірне число" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Невірний власник" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"Опція --preserve є застарілою, замість неї використовуйте --preserve-" +"permissions --preserve-order" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Невірний розмір запису" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "Розмір запису має ділитися на %d." -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Невірна кількість елементів" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Дозволяється лише одна опція --to-command" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Невірний аргумент вказання густини: `%s'" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Невідома густина: `%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "Опції `-[0-7][lmh]' не підтримуються *цією* версією tar" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[ФАЙЛ]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "Стара опція `%c' потребує аргументу" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "вказання --occurrence не має сенсу без вказання переліку файлів" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "" "опцію --occurrence не можна використовувати у зазначеному режимі роботи" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "Вказання декількох файлів потребує вказання опції `-M'" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Не можна використовувати --listed-incremental разом з --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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)" @@ -2264,50 +2280,50 @@ msgstr[0] "%s: Мітка тому є надто довга (обмеження msgstr[1] "%s: Мітка тому є надто довга (обмеження в %lu байти)" msgstr[2] "%s: Мітка тому є надто довга (обмеження в %lu байтів)" -#: src/tar.c:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Не можна перевіряти багатотомні архіви" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Не можна перевіряти стиснені архіви" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "Не можна використовувати стиснення багатотомних архівів" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Не можна з'єднувати стиснені архіви" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "Опція --pax-option використовується тільки з архівами у форматі POSIX" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "Розмір тому не може бути більшим від розміру запису" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "Опція --preserve-order несумісна з --listed-incremental" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "Полохливо відмовляюся створювати пустий архів" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" -msgstr "Опції `-Aru' не сумісні з `-f -'" +msgstr "Опції `-Aru' несумісні з `-f -'" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "Необхідно вказати одну з опцій `-Acdtrux'" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Невдачне завершення внаслідок попередніх помилок" #: src/update.c:86 #, c-format @@ -2572,12 +2588,12 @@ msgstr "збій виконання stat(%s)" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "замовлений розмір файлу %lu, справжній -- %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "створений файл не є розсіяним" #: tests/genfile.c:353 #, c-format @@ -2670,173 +2686,7 @@ msgstr "опція --stat вимагає назв файлів" 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 "розмір блока" - -#~ msgid "[.]NUMBER" -#~ msgstr "[.]ЧИСЛО" - -#~ msgid "%s: Read error at byte %s, reading %lu byte" -#~ msgid_plural "%s: Read error at byte %s, reading %lu bytes" -#~ msgstr[0] "%s: Помилка в позиції %s, під час читання %lu байту" -#~ msgstr[1] "%s: Помилка в позиції %s, під час читання %lu байтів" -#~ msgstr[2] "%s: Помилка в позиції %s, під час читання %lu байтів" - -#~ msgid "--Mangled file names--\n" -#~ msgstr "--Закодовані назви файлів--\n" - -#~ msgid "Unexpected EOF in mangled names" -#~ msgstr "Неочікуваний кінець файла під час читання закодованих назв" - -#~ msgid "Renamed %s to %s" -#~ msgstr "Перейменовано %s на %s" - -#~ msgid "%s: Cannot symlink to %s" -#~ msgstr "%s: Не вдається створити символічне посилання до %s" - -#~ msgid "Symlinked %s to %s" -#~ msgstr "Створено символічне посилання %s до %s" - -#~ msgid "Unknown demangling command %s" -#~ msgstr "Невідома команда розкодування назв %s" - -#~ msgid "Time stamp out of range" -#~ msgstr "Значення часу поза допустимими межами" - -#~ msgid "Modification time (seconds) out of range" -#~ msgstr "Час модифікації (секунди) поза межами діапазону" - -#~ msgid "Modification time (nanoseconds) out of range" -#~ msgstr "Час модифікації (наносекунди) поза межами діапазону" - -#~ msgid "Device number out of range" -#~ msgstr "Номер пристрою поза допустимими межами" - -#~ msgid "Error reading time stamp" -#~ msgstr "Помилка читання мітки часу" - -#~ msgid "Unexpected EOF" -#~ msgstr "Неочікуваний кінець файла" - -#~ msgid "same as -N" -#~ msgstr "Те ж, що і -N" - -#~ msgid "" -#~ "creating multi-volume archives in posix format requires using --tape-" -#~ "length (-L) option" -#~ msgstr "" -#~ "створення багатотомних архівів вимагає використання опції --tape-length (-" -#~ "L)" - -#~ msgid "print total bytes written while creating archive" -#~ msgstr "" -#~ "друкувати загальну кількість байтів, записаних під час створення архіву" - -#~ msgid "Semantics of -l option will change in the future releases." -#~ msgstr "Значення опції -l зміниться у майбутніх версіях програми." - -#~ msgid "Please use --one-file-system option instead." -#~ msgstr "Будь ласка використовуйте опцію --one-file-system." - -#~ msgid "Missing file name after -C" -#~ msgstr "Відсутня назва файлу після -C" - -#~ msgid "exclude patterns are plain strings" -#~ msgstr "шаблони виключення є простими символьними рядками" - -# FIXME -#~ msgid "exclude patterns use wildcards (default)" -#~ msgstr "шаблони виключення містять мета-символи '*' і '?' (типово)" - -#~ msgid "" -#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" -#~ "You may redistribute it under the terms of the GNU General Public " -#~ "License;\n" -#~ "see the file named COPYING for details." +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" #~ msgstr "" -#~ "Ця програма постачається БЕЗ БУДЬ-ЯКОЇ ГАРАНТІЇ, у межах дозволених\n" -#~ "законом. Ви можете розповсюджувати її на умовах ліцензії GNU General\n" -#~ "Public License; Додаткову інформацію дивіться у файл з назвою COPYING." - -#~ msgid "rmtd: Garbage command %c\n" -#~ msgstr "rmtd: Хибна команда %c\n" - -#~ msgid "WARNING: No volume header" -#~ msgstr "ПОПЕРЕДЖЕННЯ: Заголовок тому відсутній" - -#~ msgid "Visible long name error" -#~ msgstr "Помилка довгої назви" - -#~ msgid "Visible longname error" -#~ msgstr "Помилка довгої назви" - -#~ msgid "don't change access times on dumped files" -#~ msgstr "не відновлювати час доступу доданих файлів" - -#~ msgid "extract permissions information" -#~ msgstr "встановлювати права доступу з архіву" - -#~ msgid "do not extract permissions information" -#~ msgstr "не встановлювати права доступу з архіву" - -#~ msgid "FILE-OF-NAMES" -#~ msgstr "ФАЙЛ-З-НАЗВАМИ" - -#~ msgid "dump instead the files symlinks point to" -#~ msgstr "додавати файли на яки вказують символічні посилання" - -#~ msgid "Print license and exit" -#~ msgstr "Вивести текст ліцензії та вийти" - -#~ msgid "" -#~ "Based on the work of John Gilmore and Jay Fenlason. See AUTHORS\n" -#~ "for complete list of authors.\n" -#~ msgstr "" -#~ "На основі програми Джона Гілмора і Джея Фенласона. Повний перелік авторів " -#~ "див. у файлі AUTHORS.\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 є вільна програма; ви можете розповсюджувати його чи/та\n" -#~ " змінювати його на умовах ліцензії GNU General Public License\n" -#~ " опублікованої Free Software Foundation; версії 2 цієї ліцензії, або\n" -#~ " (за вашим бажанням) будь-якої пізнішої версії.\n" -#~ "\n" -#~ " GNU tar розповсюджується з надією, що він буде корисним, але\n" -#~ " БЕЗ БУДЬ-ЯКОЇ ГАРАНТІЇ; навіть без неявної гарантії\n" -#~ " КОМЕРЦІЙНОЇ ПРИДАТНОСТІ або ПРИДАТНОСТІ ДЛЯ ПЕВНОЇ МЕТИ. Докладніше\n" -#~ " про це читайте у GNU General Public License.\n" -#~ "\n" -#~ " Разом з програмою GNU tar ви повинні були отримати копію GNU General\n" -#~ " Public License; якщо це не так, напишіть до Free Software\n" -#~ " Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, " -#~ "USA.\n" - -#~ msgid "Warning: the -y option is not supported; perhaps you meant -j?" -#~ msgstr "" -#~ "Попередження: опція -y не підтримується. Можливо ви маєте на увазі -j?" - -#~ msgid "Error in writing to standard output" -#~ msgstr "Помилка запису до стандартного виводу" +#~ "Попередження: опція -I не підтримується. Можливо ви маєте на увазі -j або " +#~ "-T?" diff --git a/po/vi.gmo b/po/vi.gmo index 583b0dd..284ed3c 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index aeca325..93b1e8b 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.20 package. +# Copyright © 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the tar package. # Phan Vinh Thinh , 2005. -# Clytie Siddall , 2007-2008. +# Clytie Siddall , 2007-2009. # msgid "" msgstr "" -"Project-Id-Version: tar 1.20\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-04-15 22:28+0930\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2009-01-27 18:57+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.7b3\n" +"X-Generator: LocFactoryEditor 1.8\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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "hiển thị trợ giúp này" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 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:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: 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:779 +#: lib/argp-parse.c:85 src/tar.c:780 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:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "In ra phiên bản chương trình" @@ -311,11 +311,11 @@ msgstr "Đang thay thế `.' cho đích đến rỗng của liên kết cứng" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "`" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "'" @@ -367,10 +367,11 @@ msgid "(C)" msgstr "©" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -490,6 +491,28 @@ msgstr "" "%s, %s, %s, %s,\n" "%s, %s và các người khác.\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"Thông báo lỗi tới <%s>.\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "Chuỗi gõ quá dài" @@ -526,15 +549,6 @@ msgstr "" " --version Đưa ra thông tin phiên bản.\n" " --help Đưa ra trợ giúp này.\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"Thông báo lỗi tới <%s>.\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "Lỗi hiệu số tìm nơi" @@ -559,100 +573,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:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "Tổng số byte đã ghi" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "Tổng số byte đã đọc" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "Tổng số byte đã xoá: %s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(đường ống)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "Giá trị cho record_size không đúng" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "Không đưa ra tên tập tin lưu trữ" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "Không kiểm tra được tập tin lưu trữ stdin/stdout" -#: src/buffer.c:536 +#: src/buffer.c:538 #, 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:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "Không cập nhật được lưu trữ đã nén" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "Tại đầu băng ghi âm, thoát ra bây giờ" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "Quá nhiều lỗi, đang thoát" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format 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:716 +#: src/buffer.c:718 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Khối chưa sắp hàng (%lu byte) trong tập tin lưu trữ" -#: src/buffer.c:793 +#: src/buffer.c:795 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:825 +#: src/buffer.c:827 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:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: chứa số thứ tự khối không đúng" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "Số thứ tự khối thừa ra" -#: src/buffer.c:929 +#: src/buffer.c:931 #, 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:935 +#: src/buffer.c:937 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:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 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:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -663,65 +677,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:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Tạo một trình bao con\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? In ra danh sách này\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "Không có khối mới; đang thoát.\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 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:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Gõ sai. (Gỏ ? để xem trợ giúp.)\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "Câu lệnh %s không thành công" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, 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:1223 +#: src/buffer.c:1225 #, 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:1237 +#: src/buffer.c:1239 #, 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:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, 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" +msgstr "Khối tin này vượt quá dãy cho phép (%s - %s != %s)" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, 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:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "Khối %s không tương ứng %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -729,10 +743,9 @@ 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 +#: src/buffer.c:1621 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" +msgstr "tiến trình ghi (write) không dừng lại tại một ranh giới khối" #: src/compare.c:96 #, c-format @@ -744,7 +757,7 @@ 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:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 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ữ" @@ -861,7 +874,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "chưa đổ nội dung" @@ -890,7 +903,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:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "chưa đổ thư mục" @@ -984,122 +997,122 @@ msgstr "Không thể đổi tên %s thành %s" 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:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s: Đã đổi tên thư mục từ %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Đã đổi tên thư mục" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s: Thư mục là mới" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "Tem thời gian không đúng" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "Thời gian sửa đổi không hợp lệ (giây)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "Thời gian sửa đổi không hợp lệ (nanô-giây)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "Số thứ tự thiết bị không đúng" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "Số thứ tự chỉ mục inode sai" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 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:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "Lỗi đọc trong tập tin ảnh chụp" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 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:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 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:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "Thiếu dấu giới hạn mục ghi" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "Định dạng tập tin dần sai" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, 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:1429 +#: src/incremen.c:1439 #, 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:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Thư mục đổ dạng sai: « X » đã nhân đôi" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Thư mục đổ dạng sai: tên rỗng trong « R »" -#: src/incremen.c:1465 +#: src/incremen.c:1475 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:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Thư mục đổ dạng sai: tên rỗng trong « T »" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, 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:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "Thư mục đổ dạng sai: « X » không bao giờ dùng" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, 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:1603 +#: src/incremen.c:1613 #, 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:1616 +#: src/incremen.c:1626 #, 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:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Đang xóa %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s: Không thể xóa bỏ" @@ -1321,86 +1334,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:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "Chế độ thao tác chính:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "liệt kê nội dung của một lưu trữ" -#: src/tar.c:376 +#: src/tar.c:375 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:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "tạo một lưu trữ mới" -#: src/tar.c:381 +#: src/tar.c:380 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:384 +#: src/tar.c:383 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:386 +#: src/tar.c:385 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:388 +#: src/tar.c:387 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:391 +#: src/tar.c:390 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:393 +#: src/tar.c:392 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:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "Từ khóa bổ nghĩa thao tác:" -#: src/tar.c:401 +#: src/tar.c:400 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:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "CHÍNH[.PHỤ]" -#: src/tar.c:403 +#: src/tar.c:402 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:405 +#: src/tar.c:404 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: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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 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:407 +#: src/tar.c:406 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:409 +#: src/tar.c:408 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:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "SỐ" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1417,117 +1430,117 @@ msgstr "" "T ».\n" "Mặc định SỐ có giá trị bằng 1." -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "có thể tìm nơi trong kho lưu trữ" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "đừng kiểm tra số thứ tự thiết bị khi tạo kho nén dần" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "kiểm tra số thứ tự thiết bị khi tạo kho nén dần" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "Điều khiển ghi đè:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "thử kiểm tra lưu trữ sau khi ghi nó" -#: src/tar.c:433 +#: src/tar.c:432 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:435 +#: src/tar.c:434 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:437 +#: src/tar.c:436 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:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "ghi đè lên những tập tin đã có khi giải phóng" -#: src/tar.c:441 +#: src/tar.c:440 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:443 +#: src/tar.c:442 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:445 +#: src/tar.c:444 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:447 +#: src/tar.c:446 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:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "Chọn luồng xuất:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "giải phóng tập tin ra đầu ra tiêu chuẩn" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "CÂU LỆNH" -#: src/tar.c:458 +#: src/tar.c:457 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:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "bỏ qua mã thoát của tiến trình con" -#: src/tar.c:462 +#: src/tar.c:461 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:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "Điều khiển thuộc tính tập tin:" -#: src/tar.c:470 +#: src/tar.c:469 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:472 +#: src/tar.c:471 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:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "NGÀY-CỦA-TẬP-TIN" -#: src/tar.c:474 +#: src/tar.c:473 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:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "THAY ĐỔI" -#: src/tar.c:476 +#: src/tar.c:475 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:478 +#: src/tar.c:477 msgid "METHOD" msgstr "PHƯƠNG PHÁP" -#: src/tar.c:479 +#: src/tar.c:478 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,29 +1550,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:483 +#: src/tar.c:482 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:485 +#: src/tar.c:484 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:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "giải phóng tập tin như tự bạn" -#: src/tar.c:489 +#: src/tar.c:488 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:491 +#: src/tar.c:490 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:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1567,15 +1580,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:497 +#: src/tar.c:496 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:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "giống như khi có hai tùy chọn -p và -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1583,139 +1596,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:505 +#: src/tar.c:504 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:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "Lựa chọn và chuyển đổi thiết bị:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "LƯU TRỮ" -#: src/tar.c:513 +#: src/tar.c:512 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:515 +#: src/tar.c:514 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:517 +#: src/tar.c:516 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:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "sử dụng CÂU LỆNH từ xa thay cho rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "chỉ ra ổ và mật độ ghi dữ liệu" -#: src/tar.c:537 +#: src/tar.c:536 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:539 +#: src/tar.c:538 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:541 +#: src/tar.c:540 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:544 +#: src/tar.c:543 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:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "Khối của thiết bị:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "KHỐI" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "KHỐI X 512 byte cho mỗi bản ghi" -#: src/tar.c:554 +#: src/tar.c:553 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:556 +#: src/tar.c:555 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:558 +#: src/tar.c:557 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:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "Lựa chọn định dạng lưu trữ:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "ĐỊNH DẠNG" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "tạo lưư trữ với định dạng đưa ra" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "ĐỊNH DẠNG là một trong số sau:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "định dạng tar V7 cũ" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "định dạng GNU theo như tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "định dạng tar GNU 1.13.x" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "định dạng PoSIX 1003.1-1988 (ustar)" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "định dạng POSIX 1003.1-2001 (pax)" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "bằng pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "giống như --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "giống như --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "từ_khoá[[:]=giá_trị][,từ_khoá[[:]=giá_trị]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "từ khóa điều khiển pax" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "VĂN BẢN" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1723,98 +1736,102 @@ 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:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "Tùy chọn nén:" -#: src/tar.c:596 +#: src/tar.c:595 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:598 +#: src/tar.c:597 #, 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" +msgid "do not use archive suffix to determine the compression program" +msgstr "không nên dùng hậu tố lưu trữ để xác định chương trình nén" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "lọc lưu trữ qua bzip2" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "lọc lưu trữ qua gzip" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "lọc lưu trữ qua compress" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "lọc lưu trữ qua lzma" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "lọc lưu trữ qua gzip" +msgstr "lọc kho lưu trữ qua lzop" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "lọc lưu trữ qua gzip" + +#: src/tar.c:614 msgid "PROG" msgstr "TRÌNH" -#: src/tar.c:614 +#: src/tar.c:615 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:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "Lựa chọn tập tin nội bộ:" -#: src/tar.c:622 +#: src/tar.c:623 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:623 +#: src/tar.c:624 msgid "DIR" msgstr "THƯ MỤC" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "thay đổi tới thư mục THƯ MỤC" -#: src/tar.c:626 +#: src/tar.c:627 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:628 +#: src/tar.c:629 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:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "tắt hiệu ứng của tùy chọn « --null » đi trước" -#: src/tar.c:632 +#: src/tar.c:633 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:634 +#: src/tar.c:635 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:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "MẪU" -#: src/tar.c:636 +#: src/tar.c:637 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:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "loại trừ những mẫu liệt kê trong TẬP TIN" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1822,88 +1839,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:643 +#: src/tar.c:644 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:646 +#: src/tar.c:647 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:648 +#: src/tar.c:649 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:651 +#: src/tar.c:652 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:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "loại trữ thư mục chứa TẬP TIN" -#: src/tar.c:655 +#: src/tar.c:656 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:657 +#: src/tar.c:658 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:659 +#: src/tar.c:660 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:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "đệ quy vào các thư mục (mặc định)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "đừng bỏ `/' ở đầu tên tập tin" -#: src/tar.c:665 +#: src/tar.c:666 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:667 +#: src/tar.c:668 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:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "TÊN-THÀNH-VIÊN" -#: src/tar.c:669 +#: src/tar.c:670 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:671 +#: src/tar.c:672 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:673 +#: src/tar.c:674 msgid "DATE" msgstr "NGÀY" -#: src/tar.c:674 +#: src/tar.c:675 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:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "ĐIỀU KHIỂN" -#: src/tar.c:676 +#: src/tar.c:677 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:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "CHUỖI" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -1911,88 +1928,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:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "Chuyển dạng tên tập tin:" -#: src/tar.c:685 +#: src/tar.c:686 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:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "BIỂU THỨC" -#: src/tar.c:688 +#: src/tar.c:689 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:694 +#: src/tar.c:695 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:697 +#: src/tar.c:698 msgid "ignore case" msgstr "không phân biệt chữ hoa/thường" -#: src/tar.c:699 +#: src/tar.c:700 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:701 +#: src/tar.c:702 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:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "khớp có phân biệt chữ hoa/ thường (mặc định)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "dùng ký tự đại diện (mặc định để loại trừ)" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "khớp chuỗi nghĩa chữ" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "ký tự đại diện không tương ứng '/'" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "ký tự đại diện tương ứng '/' (mặc định để loại trừ)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "Dữ liệu kết quả có tính thông tin:" -#: src/tar.c:719 +#: src/tar.c:720 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:721 +#: src/tar.c:722 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:723 +#: src/tar.c:724 msgid "ACTION" msgstr "HÀNH_ĐỘNG" -#: src/tar.c:724 +#: src/tar.c:725 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:727 +#: src/tar.c:728 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:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "TÍN HIỆU" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2005,27 +2022,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:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "in ra ngày sửa đổi tập tin theo UTC" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "gửi kết quả chi tiết tới TẬP TIN" -#: src/tar.c:738 +#: src/tar.c:739 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:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "hỏi xác nhận trước mỗi hành động" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "hiển thị các giá trị mặc định của tar" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2033,32 +2050,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:747 +#: src/tar.c:748 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:750 +#: src/tar.c:751 msgid "STYLE" msgstr "KIỂU DÁNG" -#: src/tar.c:751 +#: src/tar.c:752 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:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "cũng trích dẫn các ký tự của CHUỖI" -#: src/tar.c:755 +#: src/tar.c:756 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:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "Tùy chọn tương thích:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2066,56 +2083,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:768 +#: src/tar.c:769 msgid "Other options:" msgstr "Những tùy chọn khác:" -#: src/tar.c:771 +#: src/tar.c:772 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:919 +#: src/tar.c:920 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:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "Mâu thuẫn giữa các tùy chọn nén" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr "Không rõ tên tín hiệu : %s" -#: src/tar.c:1009 +#: src/tar.c:1010 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:1017 +#: src/tar.c:1018 #, 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:1042 +#: src/tar.c:1043 #, 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:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: danh sách tập tin đã được đọc" -#: src/tar.c:1184 +#: src/tar.c:1185 #, 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:1249 +#: src/tar.c:1250 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:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2123,164 +2140,163 @@ msgstr "" "\n" "tar *này* mặc định tới:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "Nhân tố khối không đúng" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "Chiều dài băng ghi âm không đúng" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "Có nhiều ngày bắt đầu" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "Giá trị phiên bản sparse không hợp lệ" -#: src/tar.c:1585 +#: src/tar.c:1584 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:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "giá trị « --checkpoint » không phải số nguyên" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s: Nhóm không đúng" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "Đưa ra chế độ không đúng trên tùy chọn" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "Số không đúng" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "Chủ sở hữu không đúng" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"Tùy chọn « --preserve » bị phản đối, hãy sử dụng tùy chọn « --preserve-" +"permissions » « --preserve-order » để thay thế" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "Kích thước bản ghi không đúng" -#: src/tar.c:1836 +#: src/tar.c:1835 #, 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:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "Số thứ tự của nguyên tố không đúng" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "Cho phép chỉ một tùy chọn « --to-command »" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "Tham số mật độ dạng sai: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "Mật độ không rõ : « %c »" -#: src/tar.c:2012 +#: src/tar.c:2011 #, 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:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[TẬP TIN]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, 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:2235 +#: src/tar.c:2234 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:2241 +#: src/tar.c:2240 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:2271 +#: src/tar.c:2270 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:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "Không thể kết hợp --listed-incremental với --newer" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "Không thể kiểm tra lưu trữ nhiều khối" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "Không thể kiểm tra lưu trữ đã nén" -#: src/tar.c:2314 +#: src/tar.c:2313 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:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "Không thể ghép nối các kho nén" -#: src/tar.c:2332 +#: src/tar.c:2331 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:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "Chiều dài khối tin không thể nhỏ hơn kích cỡ mục ghi" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" +"Tùy chọn « --preserve-order » không tương thích với « --listed-incremental »" -#: src/tar.c:2364 +#: src/tar.c:2363 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:2389 +#: src/tar.c:2388 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:2478 +#: src/tar.c:2477 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:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Đang thoát với trạng thái thất bại do lỗi xảy ra trước" #: src/update.c:86 #, c-format @@ -2546,12 +2562,12 @@ msgstr "stat(%s) bị lỗi" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "yêu cầu chiều dài tập tin %lu mà có %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "đã tạo tập tin không phải thưa thớt (sparse)" #: tests/genfile.c:353 #, c-format @@ -2644,9 +2660,5 @@ msgstr "--stat yêu cầu tên tập tin" 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" +#~ 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?" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index e8bbcd0..d501c0e 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index aa3cd56..907b108 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: tar 1.20\n" +"Project-Id-Version: tar 1.21\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2008-12-27 00:44+0200\n" -"PO-Revision-Date: 2008-06-25 12:53中国标准时间\n" +"POT-Creation-Date: 2009-03-05 09:18+0200\n" +"PO-Revision-Date: 2009-01-04 13:57+0800\n" "Last-Translator: Ji ZhengYu \n" "Language-Team: Chinese (simplified) \n" @@ -82,7 +82,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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, c-format msgid "Report bugs to %s.\n" msgstr "将错误报告发送到 %s。\n" @@ -91,15 +91,15 @@ msgstr "将错误报告发送到 %s。\n" msgid "Unknown system error" msgstr "未知的系统错误" -#: lib/argp-parse.c:81 src/tar.c:773 +#: lib/argp-parse.c:81 src/tar.c:774 msgid "give this help list" msgstr "显示此帮助列表" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 msgid "give a short usage message" msgstr "显示简短的用法说明" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "名称" @@ -112,11 +112,11 @@ msgstr "设置程序名" msgid "SECS" msgstr "秒" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "挂起 SECS 秒(默认 3600)" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 msgid "print program version" msgstr "打印程序版本" @@ -310,11 +310,11 @@ msgstr "为空的硬连接替换“.”" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "“" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "”" @@ -366,10 +366,11 @@ msgid "(C)" msgstr "(C)" #: lib/version-etc.c:67 +#, fuzzy msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -489,6 +490,28 @@ msgstr "" "%s，%s，%s，%s，\n" "%s，%s，和其他人所写。\n" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"将错误报告到 <%s>。\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "输入字符串太长了" @@ -525,15 +548,6 @@ msgstr "" " --version 输出版本信息。\n" " --help 输出此帮助。\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"将错误报告到 <%s>。\n" - #: rmt/rmt.c:397 msgid "Seek offset error" msgstr "定位偏移量错误" @@ -558,100 +572,100 @@ msgstr "过早的文件结尾" msgid "Garbage command" msgstr "垃圾命令" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 msgid "Total bytes written" msgstr "总计写入字节数" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "总计读取字节数" -#: src/buffer.c:363 +#: src/buffer.c:365 #, c-format msgid "Total bytes deleted: %s\n" msgstr "总计删除字节数：%s\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(管道)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "record_size 的无效值" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "未给出归档文件名" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "无法验证标准输入/标准输出归档文件" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "归档被压缩。使用 %s 选项" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "无法更新压缩归档文件" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "处于磁带的起点，现在退出" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "错误过多，退出" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "记录大小 = %lu 块" -#: src/buffer.c:716 +#: src/buffer.c:718 #, 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 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "无法倒回归档文件；如果没有 -i 可能无法读入它" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek 未停在记录边界处" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s：包含无效的卷编号" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "卷编号溢出" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "为 %2$s 准备卷 #%1$d 并按回车：" -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "需得到用户应答时文件结束" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "警告：归档文件不完整" -#: src/buffer.c:954 +#: src/buffer.c:956 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -662,74 +676,73 @@ msgstr "" " q\t\t终止 tar\n" " y or newline\t继续操作\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! 衍生出一个子 shell\n" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr " ? 打印此列表\n" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "没有新的卷；退出。\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "未指定文件名。重试。\n" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "无效输入。输入 ? 显示帮助。\n" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, c-format msgid "%s command failed" msgstr "%s 命令失败" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s 在本卷可能连续: 头部包含截短的名字" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s 在本卷中不连续" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s 的大小错误 (%s != %s + %s)" -#: src/buffer.c:1251 -#, fuzzy, c-format +#: src/buffer.c:1253 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "此卷次序有误" +msgstr "此卷次序有误（%s - %s != %s）" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "归档未被标记为匹配 %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "卷标 %s 不匹配 %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, 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 +#: src/buffer.c:1621 msgid "write did not end on a block boundary" -msgstr "rmtlseek 未停在记录边界处" +msgstr "写操作未在记录边界处终止" #: src/compare.c:96 #, c-format @@ -741,7 +754,7 @@ msgstr[0] "仅能读入 %2$lu 中的 %1$lu 个字节" msgid "Contents differ" msgstr "内容不同" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "归档文件中异常的 EOF" @@ -857,7 +870,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "未输出内容" @@ -886,7 +899,7 @@ msgstr "%s：文件是归档文件；未输出" msgid "%s: File removed before we read it" msgstr "%s：文件在我们读入之前被删除了" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 msgid "directory not dumped" msgstr "未输出目录" @@ -949,7 +962,7 @@ msgstr "正在读入 %s\n" #: src/extract.c:1143 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" -msgstr "%s：无法展开 -- 文件一直持续到另一卷中" +msgstr "%s：无法展开 -- 文件一直延伸至另一卷中" #: src/extract.c:1150 src/list.c:1090 #, fuzzy @@ -981,122 +994,122 @@ msgstr "无法将 %s 重命名为 %s" msgid "Error is not recoverable: exiting now" msgstr "错误不可恢复：现在退出" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s：目录已改名，不再是 %s" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s：目录已被改名" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s：目录是新的" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "无效的时间戳" -#: src/incremen.c:949 +#: src/incremen.c:959 msgid "Invalid modification time (seconds)" msgstr "无效的修改时间(秒)" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "无效的修改时间(纳秒)" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "无效的设备号" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "无效的 inode 号" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "读取目录文件时字段太长" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "目录文件读取错误" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 msgid "Unexpected EOF in snapshot file" msgstr "目录文件中异常的文件结尾(EOF)" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "目录文件中异常的字段值" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "缺少记录终止符" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "文件格式错误增量" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "不支持增量格式版本: %" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "错误的 dumpdir: 需要“%c”但实际为 %#3o" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "错误的 dumpdir: 重复的“X”" -#: src/incremen.c:1452 +#: src/incremen.c:1462 msgid "Malformed dumpdir: empty name in 'R'" msgstr "错误的 dumpdir: “R”中有空名字" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "错误的 dumpdir: “R”后未紧接着用“T”" -#: src/incremen.c:1471 +#: src/incremen.c:1481 msgid "Malformed dumpdir: empty name in 'T'" msgstr "错误的 dumpdir: “T”中有空名字" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "错误的 dumpdir: 需要“%c”但实际为数据结尾" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "错误的 dumpdir: 从未用过“X”" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "无法通过模板 %s 创建临时目录" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" -msgstr "" +msgstr "%s：未清除目录：无法 stat" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: 目录在不同的设备上: 未清除" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在删除 %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s：无法删除" @@ -1313,86 +1326,86 @@ msgstr "" " nil, existing 如果编号备份存在则进行编号备份，否则进行简单备份\n" " never, simple 总是使用简单备份\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "主操作模式:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "列出归档内容" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "从归档中解出文件" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "创建一个新归档" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "找出归档和文件系统的差异" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "追加文件至归档结尾" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "仅追加比归档中副本更新的文件" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "追加 tar 文件至归档" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "从归档(非磁带！)中删除" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "测试归档卷标并退出" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "操作修饰符:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "高效处理离散文件" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "设置所用的离散格式版本(隐含 --sparse)" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "处理老式的 GNU 格式的增量备份" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "文件" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "处理新式的 GNU 格式的增量备份" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "当遇上不可读文件时不要以非零值退出" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "NUMBER" -#: src/tar.c:411 +#: src/tar.c:410 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, --" @@ -1403,116 +1416,116 @@ msgstr "" "extract 或是 --list 中的一个联合使用时，此选项才有效。而且不管文件列表是以命" "令行形式给出或是通过 -T 选项指定的；NUMBER 值默认为 1" -#: src/tar.c:417 +#: src/tar.c:416 msgid "archive is seekable" msgstr "归档可检索" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "当创建增量归档时不要检查设备号" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "当创建增量归档时检查设备号(默认)" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "重写控制:" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "在写入以后尝试校验归档" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "在添加文件至归档后删除它们" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "解压时不要替换存在的文件" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "不要替换比归档中副本更新的已存在的文件" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "解压时重写存在的文件" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "在解压要重写的文件之前先删除它们" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "解压目录之前先清除目录层次" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "保留已存在目录的元数据" -#: src/tar.c:447 +#: src/tar.c:446 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "解压时重写已存在目录的元数据(默认)" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "选择输出流:" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "解压文件至标准输出" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "COMMAND" -#: src/tar.c:458 +#: src/tar.c:457 msgid "pipe extracted files to another program" msgstr "将解压的文件通过管道传送至另一个程序" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "忽略子进程的退出代码" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "将子进程的非零退出代码认为发生错误" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "操作文件属性:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "强制将 NAME 作为所添加的文件的所有者" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "强制将 NAME 作为所添加的文件的组所有者" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "DATE-OR-FILE" -#: src/tar.c:474 +#: src/tar.c:473 msgid "set mtime for added files from DATE-OR-FILE" msgstr "从 DATE-OR-FILE 中为添加的文件设置 mtime" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "CHANGES" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "强制将所添加的文件(符号)更改为权限 CHANGES" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "METHOD" -#: src/tar.c:479 +#: src/tar.c:478 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,448 +1534,452 @@ msgstr "" "在输出的文件上保留访问时间，要么通过在读取(默认 METHOD=‘replace’)后还原时间，" "要不就不要在第一次(METHOD=‘system’)设置时间" -#: src/tar.c:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "不要解压文件的修改时间" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "尝试解压时保持所有者关系一致" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "将文件解压为您所有" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "总是以数字代表用户/组的名称" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "解压文件权限信息(默认只为超级用户服务)" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "从归档中解压权限时使用用户的掩码位(默认为普通用户服务)" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "为解压至匹配归档排序名称" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "与 -p 和 -s 一样" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "直到解压结束才设置修改时间和所解目录的权限" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "取消 --delay-directory-restore 选项的效果" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "设备选择和切换:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "使用归档文件或 ARCHIVE 设备" -#: src/tar.c:515 +#: src/tar.c:514 msgid "archive file is local even if it has a colon" msgstr "即使归档文件存在副本还是把它认为是本地归档" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "使用指定的 rmt COMMAND 代替 rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "使用远程 COMMAND 代替 rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "指定驱动器和压缩率" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "创建/列出/解压多卷归档文件" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "写入 NUMBER × 1024 字节后更换磁带" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "在每卷磁带最后运行脚本(隐含 -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "使用/更新 FILE 中的卷数" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "设备分块:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "BLOCKS" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "每个记录 BLOCKS x 512 字节" -#: src/tar.c:554 +#: src/tar.c:553 msgid "NUMBER of bytes per record, multiple of 512" msgstr "每个记录的字节数 NUMBER，乘以 512" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "忽略归档中的零字节块(即文件结尾)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "读取时重新分块(只对 4.2BSD 管道有效)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "选择归档格式:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:566 +#: src/tar.c:565 msgid "create archive of the given format" msgstr "创建指定格式的归档" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "FORMAT 是以下格式中的一种:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "old V7 tar 格式" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "GNU 格式 as per tar <= 1.12" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x 格式" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) 格式" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) 格式" -#: src/tar.c:579 +#: src/tar.c:578 msgid "same as pax" msgstr "等同于 pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "等同于 --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "等同于 --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "关键字[[:]=值][,关键字[[:]=值]]..." -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "控制 pax 关键字" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:589 +#: src/tar.c:588 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "创建带有卷名 TEXT 的归档；在列出/解压时，使用 TEXT 作为卷名的模式串" -#: src/tar.c:594 +#: src/tar.c:593 msgid "Compression options:" msgstr "压缩选项:" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "使用归档后缀来决定压缩程序" -#: src/tar.c:598 +#: src/tar.c:597 #, fuzzy -msgid "do not use use archive suffix to determine the compression program" -msgstr "使用归档后缀来决定压缩程序" +msgid "do not use archive suffix to determine the compression program" +msgstr "未使用归档后缀来决定压缩程序" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "通过 bzip2 过滤归档" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "通过 gzip 过滤归档" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "通过 compress 过滤归档" -#: src/tar.c:610 +#: src/tar.c:609 msgid "filter the archive through lzma" msgstr "通过 lzma 过滤归档" -#: src/tar.c:612 -#, fuzzy +#: src/tar.c:611 msgid "filter the archive through lzop" -msgstr "通过 gzip 过滤归档" +msgstr "通过 lzop 过滤归档" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "通过 gzip 过滤归档" + +#: src/tar.c:614 msgid "PROG" msgstr "PROG" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "通过 PROG 过滤(必须是能接受 -d 选项的程序)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "本地文件选择:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "添加指定的 FILE 至归档(如果名字以 - 开始会很有用的)" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "DIR" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "改变至目录 DIR" -#: src/tar.c:626 +#: src/tar.c:627 msgid "get names to extract or create from FILE" msgstr "从 FILE 中获取文件名来解压或创建文件" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" -msgstr "-T 读取以空终止的名字，禁用 -C" +msgstr "-T 读取以空终止的名字，-C 禁用" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "禁用上一次的效果 --null 选项" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" -msgstr "结束以 -T 读取的文件名(默认)" +msgstr "以 -T 读取的文件名作为引用结束(默认)" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" -msgstr "不要结束以 -T 读取的文件名" +msgstr "不以 -T 读取的文件名作为引用结束" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "排除以 PATTERN 指定的文件" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "排除 FILE 中列出的模式串" -#: src/tar.c:640 +#: src/tar.c:641 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "除标识文件本身外，排除包含 CACHEDIR.TAG 的目录中的内容" -#: src/tar.c:643 +#: src/tar.c:644 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "排除包含 CACHEDIR.TAG 的目录中所有内容" -#: src/tar.c:646 +#: src/tar.c:647 msgid "exclude directories containing CACHEDIR.TAG" msgstr "排除包含 CACHEDIR.TAG 的目录" -#: src/tar.c:648 +#: src/tar.c:649 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "除 FILE 自身外，排除包含 FILE 的目录中的内容" -#: src/tar.c:651 +#: src/tar.c:652 msgid "exclude everything under directories containing FILE" msgstr "排除包含 FILE 的目录中的所有内容" -#: src/tar.c:653 +#: src/tar.c:654 msgid "exclude directories containing FILE" msgstr "排除包含 FILE 的目录" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "排除版本控制系统目录" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "避免目录中的自动降级" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "创建归档时保存在本地文件系统中" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "目录递归(默认)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "不要从文件名中清除引导符‘/’" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "跟踪符号链接；将它们所指向的文件归档并输出" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "跟踪硬链接；将它们所指向的文件归档并输出" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "MEMBER-NAME" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "从归档中的 MEMBER-NAME 成员处开始" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "只保存比 DATE-OR-FILE 更新的文件" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "DATE" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "当只有数据改变时比较数据和时间" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "在删除前备份，选择 CONTROL 版本" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "STRING" -#: src/tar.c:678 +#: src/tar.c:679 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" "在删除前备份，除非被环境变量 SIMPLE_BACKUP_SUFFIX 覆盖，否则覆盖常用后缀(‘’)" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "文件名变换:" -#: src/tar.c:685 +#: src/tar.c:686 msgid "strip NUMBER leading components from file names on extraction" msgstr "解压时从文件名中清除 NUMBER 个引导部分" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "使用 sed 代替 EXPRESSION 来进行文件名变换" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "文件名匹配选项(同时影响排除和包括模式串):" -#: src/tar.c:697 +#: src/tar.c:698 msgid "ignore case" msgstr "忽略大小写" -#: src/tar.c:699 +#: src/tar.c:700 msgid "patterns match file name start" msgstr "模式串匹配文件名头部" -#: src/tar.c:701 +#: src/tar.c:702 msgid "patterns match after any `/' (default for exclusion)" msgstr "模式串匹配任意‘/’后字符(默认对 exclusion 有效)" -#: src/tar.c:703 +#: src/tar.c:704 msgid "case sensitive matching (default)" msgstr "匹配大小写(默认)" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "使用通配符(默认对 exclusion )" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "逐字匹配字符串" -#: src/tar.c:709 +#: src/tar.c:710 msgid "wildcards do not match `/'" msgstr "通配符不匹配‘/’" -#: src/tar.c:711 +#: src/tar.c:712 msgid "wildcards match `/' (default for exclusion)" msgstr "通配符匹配‘/’(默认对排除操作有效)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "提示性输出:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "详细地列出处理的文件" -#: src/tar.c:721 +#: src/tar.c:722 msgid "display progress messages every NUMBERth record (default 10)" msgstr "每隔 NUMBER 个记录显示进度信息(默认为 10 个)" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "在每个检查点上执行 ACTION" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "只要不是所有链接都被输出就打印信息" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1973,112 +1990,112 @@ msgstr "" "号为: SIGHUP，SIGQUIT，SIGINT，SIGUSR1 和 SIGUSR2；同时也接受不带 SIG 前缀的" "信号名称" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "以 UTC 格式打印文件修改信息" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "将详细输出发送至 FILE" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "每个信息都显示归档内的块数" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "每次操作都要求确认" -#: src/tar.c:743 +#: src/tar.c:744 msgid "show tar defaults" msgstr "显示 tar 默认选项" -#: src/tar.c:745 +#: src/tar.c:746 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "列表或解压时，列出每个不匹配查找标准的目录" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "显示变换后的文件名或归档名" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "设置名称引用风格；有效的 STYLE 值请参阅以下说明" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "来自 STRING 的额外的引用字符" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "禁用来自 STRING 的字符引用" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "兼容性选项:" -#: src/tar.c:763 +#: src/tar.c:764 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "创建归档时，相当于 --old-archive；展开归档时，相当于 --no-same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "其它选项:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "禁用某些潜在的有危险的选项" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "您不能指定除“-Acdtrux”外的选项" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "压缩选项冲突" -#: src/tar.c:985 +#: src/tar.c:986 #, c-format msgid "Unknown signal name: %s" msgstr " 未知的信号名称: %s" -#: src/tar.c:1009 +#: src/tar.c:1010 msgid "Date sample file not found" msgstr "找不到数据样板文件" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "把未知的时间格式 %2$s 替换为 %1$s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "选项 %s: 将日期 ‘%s’ 当作 %s" -#: src/tar.c:1119 +#: src/tar.c:1120 #, c-format msgid "%s: file list already read" msgstr "%s: 文件列表已经读取" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: 读取的文件名含有空字符" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "--quoting-style 选项的有效参数为:" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2086,166 +2103,164 @@ msgstr "" "\n" "此 tar 默认为:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 #, fuzzy msgid "Invalid blocking factor" msgstr "无效的块因子" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "无效的磁带长度" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "多于一个时间阈值" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 #, fuzzy msgid "Invalid sparse version value" msgstr "无效的离散版本值" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "此平台不支持 --atime-preserve=‘system’ " -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "--checkpoint 值不是个整数" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s：无效的组" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "选项中给出无效的访问模式" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "无效的数字" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "无效的所有者" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"--preserve 选项已经废弃了，请使用 --preserve-permissions --preserve-order 代" +"替" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "无效的记录大小" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "记录大小必须是 %d 的倍数。" -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "无效的元素数" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "仅允许使用一个 --to-command 选项" -#: src/tar.c:1969 +#: src/tar.c:1968 #, c-format msgid "Malformed density argument: %s" msgstr "错误的压缩参数: %s" -#: src/tar.c:1995 +#: src/tar.c:1994 #, c-format msgid "Unknown density: `%c'" msgstr "未知的压缩参数: ‘%c’" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "本 tar 不支持选项“-[0-7][lmh]”" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FILE]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "旧选项“%c”需要参数。" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "没有一个文件列表时 --occurrence 是没有意义的" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence 不能用于请求的操作模式中" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "多个归档文件需要使用“-M”选项" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "无法在使用 --newer 的时候使用 --listed-incremental" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "无法检验多卷归档文件" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "无法检验压缩归档文件" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "无法使用多卷压缩归档文件" -#: src/tar.c:2320 +#: src/tar.c:2319 msgid "Cannot concatenate compressed archives" msgstr "无法联结压缩归档文件" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option 只能用于 POSIX 归档中" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" -msgstr "" +msgstr "卷长度不可小于记录大小" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +msgstr "--preserve-order 与 --listed-incremental 不匹配" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "谨慎地拒绝创建空归档文件" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "选项“-Aru”与“-f -”不兼容" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "您必须从选项“-Acdtrux”中指定一个" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "由于前次错误，将以上次的错误状态退出" #: src/update.c:86 #, c-format @@ -2500,12 +2515,12 @@ msgstr "stat(%s) 错误" #: tests/genfile.c:264 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "需要文件长度为 %lu，实际为 %lu" #: tests/genfile.c:268 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "所创建的文件非稀疏文件" #: tests/genfile.c:353 #, c-format @@ -2596,9 +2611,8 @@ msgstr "--stat 选项需要文件名" msgid "too many arguments" msgstr "参数过多" -#, fuzzy -#~ msgid "cancel effect of the previous --transform-links option" -#~ msgstr "取消 --delay-directory-restore 选项的效果" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "警告：不支持 -I 选项，或许您的意思是 -j 或者 -T ？" #~ msgid "Error exit delayed from previous errors" #~ msgstr "由于前面延迟的错误而退出" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 469d47c..41227d6 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index 9f45c99..8baed54 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-12-27 00:44+0200\n" +"POT-Creation-Date: 2009-03-05 09:18+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:1255 +#: lib/argp-help.c:1710 src/tar.c:1256 #, 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:773 +#: lib/argp-parse.c:81 src/tar.c:774 #, fuzzy msgid "give this help list" msgstr "給出這個使用方式列表" -#: lib/argp-parse.c:82 src/tar.c:774 +#: lib/argp-parse.c:82 src/tar.c:775 #, fuzzy msgid "give a short usage message" msgstr "給出簡短的使用訊息" -#: lib/argp-parse.c:83 src/tar.c:469 src/tar.c:471 src/tar.c:540 +#: lib/argp-parse.c:83 src/tar.c:468 src/tar.c:470 src/tar.c:539 #: tests/genfile.c:129 msgid "NAME" msgstr "名稱" @@ -110,11 +110,11 @@ msgstr "" msgid "SECS" msgstr "" -#: lib/argp-parse.c:85 src/tar.c:779 +#: lib/argp-parse.c:85 src/tar.c:780 msgid "hang for SECS seconds (default 3600)" msgstr "" -#: lib/argp-parse.c:142 src/tar.c:775 +#: lib/argp-parse.c:142 src/tar.c:776 #, fuzzy msgid "print program version" msgstr "印出程式版本" @@ -309,11 +309,11 @@ msgstr "以‘.’來替換空白的硬式連結目標" #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:266 +#: lib/quotearg.c:249 msgid "`" msgstr "‘" -#: lib/quotearg.c:267 +#: lib/quotearg.c:250 msgid "'" msgstr "’" @@ -368,7 +368,7 @@ msgstr "" msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later \n" +"html>.\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" @@ -465,6 +465,28 @@ msgid "" "%s, %s, and others.\n" msgstr "" +#. TRANSLATORS: The placeholder indicates the bug-reporting address +#. for this package. Please add _another line_ saying +#. "Report translation bugs to <...>\n" with the address for translation +#. bugs (typically your translation team's web or email address). +#: lib/version-etc.c:181 rmt/rmt.c:315 +#, c-format +msgid "" +"\n" +"Report bugs to <%s>.\n" +msgstr "" +"\n" +"請向 <%s> 回報錯誤。\n" + +#: lib/version-etc.c:182 +#, c-format +msgid "%s home page: .\n" +msgstr "" + +#: lib/version-etc.c:184 +msgid "General help using GNU software: .\n" +msgstr "" + #: rmt/rmt.c:142 msgid "Input string too long" msgstr "" @@ -501,15 +523,6 @@ msgstr "" " --version 輸出版本資訊。\n" " --help 輸出本輔助說明。\n" -#: rmt/rmt.c:315 -#, c-format -msgid "" -"\n" -"Report bugs to <%s>.\n" -msgstr "" -"\n" -"請向 <%s> 回報錯誤。\n" - #: rmt/rmt.c:397 #, fuzzy msgid "Seek offset error" @@ -535,101 +548,101 @@ msgstr "檔案突然結束" msgid "Garbage command" msgstr "無用的命令" -#: src/buffer.c:288 src/buffer.c:293 src/buffer.c:539 src/buffer.c:1126 +#: src/buffer.c:290 src/buffer.c:295 src/buffer.c:541 src/buffer.c:1128 #: 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:352 src/buffer.c:361 +#: src/buffer.c:354 src/buffer.c:363 #, fuzzy msgid "Total bytes written" msgstr "已寫入位元組總數: %s (%s, %s/s)\n" -#: src/buffer.c:359 src/buffer.c:373 +#: src/buffer.c:361 src/buffer.c:375 msgid "Total bytes read" msgstr "" -#: src/buffer.c:363 +#: src/buffer.c:365 #, fuzzy, c-format msgid "Total bytes deleted: %s\n" msgstr "已寫入位元組總數: %s (%s, %s/s)\n" -#: src/buffer.c:452 +#: src/buffer.c:454 msgid "(pipe)" msgstr "(管線)" -#: src/buffer.c:475 +#: src/buffer.c:477 msgid "Invalid value for record_size" msgstr "無效的紀錄大小" -#: src/buffer.c:478 +#: src/buffer.c:480 msgid "No archive name given" msgstr "沒有指定保存檔名稱" -#: src/buffer.c:522 +#: src/buffer.c:524 msgid "Cannot verify stdin/stdout archive" msgstr "無法檢驗標準輸出入保存檔" -#: src/buffer.c:536 +#: src/buffer.c:538 #, c-format msgid "Archive is compressed. Use %s option" msgstr "保存檔已壓縮過。使用 %s 選項" -#: src/buffer.c:591 src/tar.c:2318 +#: src/buffer.c:593 src/tar.c:2317 msgid "Cannot update compressed archives" msgstr "無法更新壓縮的保存檔" -#: src/buffer.c:670 +#: src/buffer.c:672 msgid "At beginning of tape, quitting now" msgstr "開始讀取磁帶時出錯，立刻退出" -#: src/buffer.c:676 +#: src/buffer.c:678 msgid "Too many errors, quitting" msgstr "錯誤過多，必須中止" -#: src/buffer.c:695 +#: src/buffer.c:697 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "紀錄大小 = %lu 區塊" -#: src/buffer.c:716 +#: src/buffer.c:718 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "保存檔中未排列的區塊 (%lu 位元組)" -#: src/buffer.c:793 +#: src/buffer.c:795 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "無法倒退保存檔檔案；沒有 -i 也許會無法讀取" -#: src/buffer.c:825 +#: src/buffer.c:827 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek 無法在紀錄分界處停止" -#: src/buffer.c:879 +#: src/buffer.c:881 #, c-format msgid "%s: contains invalid volume number" msgstr "%s：包含無效的卷冊號碼" -#: src/buffer.c:914 +#: src/buffer.c:916 msgid "Volume number overflow" msgstr "卷冊號碼已滿" -#: src/buffer.c:929 +#: src/buffer.c:931 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "準備好卷冊 #%d 以完成 %s 並按下 return: " -#: src/buffer.c:935 +#: src/buffer.c:937 msgid "EOF where user reply was expected" msgstr "到達期待使用者回答的檔案末端" -#: src/buffer.c:940 src/buffer.c:972 +#: src/buffer.c:942 src/buffer.c:974 msgid "WARNING: Archive is incomplete" msgstr "警告：保存檔不完整" -#: src/buffer.c:954 +#: src/buffer.c:956 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -641,71 +654,71 @@ msgstr "" " ! 產生一個子命令介面\n" " ? 印出本列表\n" -#: src/buffer.c:959 +#: src/buffer.c:961 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:960 +#: src/buffer.c:962 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:967 +#: src/buffer.c:969 msgid "No new volume; exiting.\n" msgstr "沒有新的卷冊；離開。\n" -#: src/buffer.c:1000 +#: src/buffer.c:1002 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1013 +#: src/buffer.c:1015 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1064 +#: src/buffer.c:1066 #, fuzzy, c-format msgid "%s command failed" msgstr "‘%s’指令失敗" -#: src/buffer.c:1219 +#: src/buffer.c:1221 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s 在本卷冊中並不連續" -#: src/buffer.c:1223 +#: src/buffer.c:1225 #, c-format msgid "%s is not continued on this volume" msgstr "%s 在本卷冊中並不連續" -#: src/buffer.c:1237 +#: src/buffer.c:1239 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s 的大小有錯誤 (%s != %s + %s)" -#: src/buffer.c:1251 +#: src/buffer.c:1253 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "本卷冊已超出序列" -#: src/buffer.c:1301 +#: src/buffer.c:1303 #, c-format msgid "Archive not labeled to match %s" msgstr "保存檔未標誌為符合 %s" -#: src/buffer.c:1304 +#: src/buffer.c:1306 #, c-format msgid "Volume %s does not match %s" msgstr "卷冊 %s 不符合 %s" -#: src/buffer.c:1400 +#: src/buffer.c:1402 #, 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 +#: src/buffer.c:1621 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek 無法在紀錄分界處停止" @@ -720,7 +733,7 @@ msgstr[0] "只能讀取 %2$lu 位元組中的 %1$lu 個" msgid "Contents differ" msgstr "內容不同" -#: src/compare.c:132 src/extract.c:790 src/incremen.c:1389 src/list.c:372 +#: src/compare.c:132 src/extract.c:790 src/incremen.c:1399 src/list.c:372 #: src/list.c:1323 msgid "Unexpected EOF in archive" msgstr "保存檔的檔案結尾不正常" @@ -836,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:543 src/incremen.c:549 +#: src/create.c:1221 src/create.c:1232 src/incremen.c:551 src/incremen.c:557 msgid "contents not dumped" msgstr "" @@ -865,7 +878,7 @@ msgstr "%s：這個檔案是保存檔；未傾印" msgid "%s: File removed before we read it" msgstr "%s：當讀取檔案時該檔案已被移除" -#: src/create.c:1591 src/incremen.c:535 +#: src/create.c:1591 src/incremen.c:543 #, fuzzy msgid "directory not dumped" msgstr "%s：包含一個快取目錄標籤；未傾印" @@ -961,126 +974,126 @@ msgstr "%s：無法改名為 %s" msgid "Error is not recoverable: exiting now" msgstr "發生無法復原的錯誤：立刻退出" -#: src/incremen.c:445 src/incremen.c:489 +#: src/incremen.c:448 src/incremen.c:492 #, fuzzy, c-format msgid "%s: Directory has been renamed from %s" msgstr "%s：目錄已被變更名稱" -#: src/incremen.c:457 +#: src/incremen.c:460 #, c-format msgid "%s: Directory has been renamed" msgstr "%s：目錄已被變更名稱" -#: src/incremen.c:502 +#: src/incremen.c:505 #, c-format msgid "%s: Directory is new" msgstr "%s：目錄是新的" -#: src/incremen.c:893 src/incremen.c:910 +#: src/incremen.c:903 src/incremen.c:920 msgid "Invalid time stamp" msgstr "無效的時間標記" -#: src/incremen.c:949 +#: src/incremen.c:959 #, fuzzy msgid "Invalid modification time (seconds)" msgstr "選項中的模式無效" -#: src/incremen.c:964 +#: src/incremen.c:974 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:984 +#: src/incremen.c:994 msgid "Invalid device number" msgstr "無效的裝置號碼" -#: src/incremen.c:999 +#: src/incremen.c:1009 msgid "Invalid inode number" msgstr "無效的 inode 號碼" -#: src/incremen.c:1050 src/incremen.c:1087 +#: src/incremen.c:1060 src/incremen.c:1097 msgid "Field too long while reading snapshot file" msgstr "" -#: src/incremen.c:1057 src/incremen.c:1095 +#: src/incremen.c:1067 src/incremen.c:1105 msgid "Read error in snapshot file" msgstr "" -#: src/incremen.c:1059 src/incremen.c:1099 src/incremen.c:1151 -#: src/incremen.c:1209 +#: src/incremen.c:1069 src/incremen.c:1109 src/incremen.c:1161 +#: src/incremen.c:1219 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "保存檔的檔案結尾不正常" -#: src/incremen.c:1066 src/incremen.c:1106 +#: src/incremen.c:1076 src/incremen.c:1116 msgid "Unexpected field value in snapshot file" msgstr "" -#: src/incremen.c:1201 +#: src/incremen.c:1211 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1252 src/incremen.c:1255 +#: src/incremen.c:1262 src/incremen.c:1265 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1274 +#: src/incremen.c:1284 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1429 +#: src/incremen.c:1439 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1439 +#: src/incremen.c:1449 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1452 +#: src/incremen.c:1462 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "未成形的密度引數: '%s'" -#: src/incremen.c:1465 +#: src/incremen.c:1475 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1471 +#: src/incremen.c:1481 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "未成形的密度引數: '%s'" -#: src/incremen.c:1491 +#: src/incremen.c:1501 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1497 +#: src/incremen.c:1507 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1541 +#: src/incremen.c:1551 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1603 +#: src/incremen.c:1613 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s：未能清空目錄；無法顯示狀態" -#: src/incremen.c:1616 +#: src/incremen.c:1626 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s：目錄位於不同的裝置；無法清空" -#: src/incremen.c:1624 +#: src/incremen.c:1634 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在刪除 %s\n" -#: src/incremen.c:1629 +#: src/incremen.c:1639 #, c-format msgid "%s: Cannot remove" msgstr "%s：無法移除" @@ -1305,86 +1318,86 @@ msgstr "" " nil, existing 若有數字的備份檔已經存在則使用數字，否則使用普通方式備份\n" " never, simple 永遠使用普通方式備份\n" -#: src/tar.c:371 +#: src/tar.c:370 msgid "Main operation mode:" msgstr "主要操作模式:" -#: src/tar.c:374 +#: src/tar.c:373 msgid "list the contents of an archive" msgstr "列出保存檔的內容" -#: src/tar.c:376 +#: src/tar.c:375 msgid "extract files from an archive" msgstr "從保存檔中解開檔案" -#: src/tar.c:379 +#: src/tar.c:378 msgid "create a new archive" msgstr "建立一個新的保存檔" -#: src/tar.c:381 +#: src/tar.c:380 msgid "find differences between archive and file system" msgstr "在保存檔與檔案系統之間找出差異" -#: src/tar.c:384 +#: src/tar.c:383 msgid "append files to the end of an archive" msgstr "加入檔案到保存檔末端" -#: src/tar.c:386 +#: src/tar.c:385 msgid "only append files newer than copy in archive" msgstr "只加入比保存檔中複本還新的檔案" -#: src/tar.c:388 +#: src/tar.c:387 msgid "append tar files to an archive" msgstr "加入 tar 檔案到保存檔中" -#: src/tar.c:391 +#: src/tar.c:390 msgid "delete from the archive (not on mag tapes!)" msgstr "從保存檔中刪除 (並非在磁帶上！)" -#: src/tar.c:393 +#: src/tar.c:392 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:398 +#: src/tar.c:397 msgid "Operation modifiers:" msgstr "運算變更項:" -#: src/tar.c:401 +#: src/tar.c:400 msgid "handle sparse files efficiently" msgstr "有效率地處理稀疏的檔案" -#: src/tar.c:402 +#: src/tar.c:401 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:403 +#: src/tar.c:402 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:405 +#: src/tar.c:404 msgid "handle old GNU-format incremental backup" msgstr "處理舊型 GNU-格式之漸進式備份" -#: 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 +#: src/tar.c:405 src/tar.c:542 src/tar.c:622 src/tar.c:626 src/tar.c:638 +#: src/tar.c:648 src/tar.c:651 src/tar.c:653 src/tar.c:736 tests/genfile.c:131 #: tests/genfile.c:179 tests/genfile.c:183 tests/genfile.c:186 msgid "FILE" msgstr "檔案" -#: src/tar.c:407 +#: src/tar.c:406 msgid "handle new GNU-format incremental backup" msgstr "處理新型 GNU-格式之漸進式備份" -#: src/tar.c:409 +#: src/tar.c:408 msgid "do not exit with nonzero on unreadable files" msgstr "離開無法讀取的檔案時不要回傳非零的值" -#: src/tar.c:410 src/tar.c:538 src/tar.c:553 src/tar.c:684 src/tar.c:720 +#: src/tar.c:409 src/tar.c:537 src/tar.c:552 src/tar.c:685 src/tar.c:721 #: tests/genfile.c:165 msgid "NUMBER" msgstr "數目" -#: src/tar.c:411 +#: src/tar.c:410 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1396,304 +1409,304 @@ msgstr "" "delete、--diff、--extract 或 --list 等次命令之一合併使用時才有效，而且要經由" "命令列 或是 -T 選項來提供一個檔案序列。預設的數目是 1。" -#: src/tar.c:417 +#: src/tar.c:416 #, fuzzy msgid "archive is seekable" msgstr "保存檔是可搜尋的" -#: src/tar.c:419 +#: src/tar.c:418 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:422 +#: src/tar.c:421 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:428 +#: src/tar.c:427 msgid "Overwrite control:" msgstr "" -#: src/tar.c:431 +#: src/tar.c:430 msgid "attempt to verify the archive after writing it" msgstr "嘗試在寫入之後驗證保存檔" -#: src/tar.c:433 +#: src/tar.c:432 msgid "remove files after adding them to the archive" msgstr "在加入檔案至保存檔之後移除它們" -#: src/tar.c:435 +#: src/tar.c:434 msgid "don't replace existing files when extracting" msgstr "解開時不要替換既有的檔案" -#: src/tar.c:437 +#: src/tar.c:436 msgid "don't replace existing files that are newer than their archive copies" msgstr "不要替換既有且比它們在保存檔中複本還新的檔案" -#: src/tar.c:439 +#: src/tar.c:438 msgid "overwrite existing files when extracting" msgstr "解開時覆寫既有檔案" -#: src/tar.c:441 +#: src/tar.c:440 msgid "remove each file prior to extracting over it" msgstr "在解開並覆寫檔案之前先移除它" -#: src/tar.c:443 +#: src/tar.c:442 msgid "empty hierarchies prior to extracting directory" msgstr "在解開目錄之前先清空目錄階層" -#: src/tar.c:445 +#: src/tar.c:444 msgid "preserve metadata of existing directories" msgstr "保留既有目錄的原始資料" -#: src/tar.c:447 +#: src/tar.c:446 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "解開時覆寫既有檔案" -#: src/tar.c:453 +#: src/tar.c:452 msgid "Select output stream:" msgstr "" -#: src/tar.c:456 +#: src/tar.c:455 msgid "extract files to standard output" msgstr "解開檔案至標準輸出" -#: src/tar.c:457 src/tar.c:516 src/tar.c:518 tests/genfile.c:162 +#: src/tar.c:456 src/tar.c:515 src/tar.c:517 tests/genfile.c:162 #: tests/genfile.c:189 msgid "COMMAND" msgstr "命令" -#: src/tar.c:458 +#: src/tar.c:457 #, fuzzy msgid "pipe extracted files to another program" msgstr "解開檔案至標準輸出" -#: src/tar.c:460 +#: src/tar.c:459 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:462 +#: src/tar.c:461 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:467 +#: src/tar.c:466 msgid "Handling of file attributes:" msgstr "檔案屬性的處理:" -#: src/tar.c:470 +#: src/tar.c:469 msgid "force NAME as owner for added files" msgstr "強制以名稱做為加入檔案的擁有者" -#: src/tar.c:472 +#: src/tar.c:471 msgid "force NAME as group for added files" msgstr "強制以名稱做為加入檔案的群組" -#: src/tar.c:473 src/tar.c:670 +#: src/tar.c:472 src/tar.c:671 msgid "DATE-OR-FILE" msgstr "檔案的日期" -#: src/tar.c:474 +#: src/tar.c:473 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "只儲存比 DATE-OF-FILE 還新的檔案" -#: src/tar.c:475 +#: src/tar.c:474 msgid "CHANGES" msgstr "變更" -#: src/tar.c:476 +#: src/tar.c:475 msgid "force (symbolic) mode CHANGES for added files" msgstr "強制以(符號)變更做為加入檔案的模式" -#: src/tar.c:478 +#: src/tar.c:477 msgid "METHOD" msgstr "" -#: src/tar.c:479 +#: src/tar.c:478 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:483 +#: src/tar.c:482 msgid "don't extract file modified time" msgstr "不要解開檔案的修改時間" -#: src/tar.c:485 +#: src/tar.c:484 msgid "try extracting files with the same ownership" msgstr "嘗試以相同的擁有身分去解開檔案" -#: src/tar.c:487 +#: src/tar.c:486 msgid "extract files as yourself" msgstr "以自己的身分解開檔案" -#: src/tar.c:489 +#: src/tar.c:488 msgid "always use numbers for user/group names" msgstr "總是使用數字做為使用者/群組名稱" -#: src/tar.c:491 +#: src/tar.c:490 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:495 +#: src/tar.c:494 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:497 +#: src/tar.c:496 msgid "sort names to extract to match archive" msgstr "解開時依名稱排序以符合保存檔" -#: src/tar.c:500 +#: src/tar.c:499 msgid "same as both -p and -s" msgstr "等同於指定 -p 與 -s" -#: src/tar.c:502 +#: src/tar.c:501 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:505 +#: src/tar.c:504 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:510 +#: src/tar.c:509 msgid "Device selection and switching:" msgstr "裝置選擇與切換:" -#: src/tar.c:512 +#: src/tar.c:511 msgid "ARCHIVE" msgstr "保存檔" -#: src/tar.c:513 +#: src/tar.c:512 msgid "use archive file or device ARCHIVE" msgstr "使用保存檔檔案或保存檔裝置" -#: src/tar.c:515 +#: src/tar.c:514 #, fuzzy msgid "archive file is local even if it has a colon" msgstr "即使具有冒號，保存檔檔案仍位於本地端" -#: src/tar.c:517 +#: src/tar.c:516 msgid "use given rmt COMMAND instead of rmt" msgstr "使用賦予的 rmt 命令以取代 rmt" -#: src/tar.c:519 +#: src/tar.c:518 msgid "use remote COMMAND instead of rsh" msgstr "使用遠端的命令以取代 rsh" -#: src/tar.c:523 +#: src/tar.c:522 msgid "specify drive and density" msgstr "指定磁碟機與記錄密度" -#: src/tar.c:537 +#: src/tar.c:536 msgid "create/list/extract multi-volume archive" msgstr "建立/列表/解開 多重卷冊的保存檔" -#: src/tar.c:539 +#: src/tar.c:538 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "在寫入 NUMBER x 1024 位元組之後更換磁帶" -#: src/tar.c:541 +#: src/tar.c:540 msgid "run script at end of each tape (implies -M)" msgstr "在每卷磁帶末端執行命令稿 (意指 -M)" -#: src/tar.c:544 +#: src/tar.c:543 msgid "use/update the volume number in FILE" msgstr "使用/更新 FILE 中的卷冊號碼" -#: src/tar.c:549 +#: src/tar.c:548 msgid "Device blocking:" msgstr "裝置分區:" -#: src/tar.c:551 +#: src/tar.c:550 msgid "BLOCKS" msgstr "區塊" -#: src/tar.c:552 +#: src/tar.c:551 msgid "BLOCKS x 512 bytes per record" msgstr "每筆紀錄含有 BLOCKS x 512 位元組" -#: src/tar.c:554 +#: src/tar.c:553 #, fuzzy msgid "NUMBER of bytes per record, multiple of 512" msgstr "每筆紀錄 SIZE 位元組，為 512 的倍數" -#: src/tar.c:556 +#: src/tar.c:555 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "忽略保存檔中零值的區塊 (意指 EOF)" -#: src/tar.c:558 +#: src/tar.c:557 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "讀取時重新分區 (用於 4.2BSD 管線)" -#: src/tar.c:563 +#: src/tar.c:562 msgid "Archive format selection:" msgstr "保存檔格式選擇:" -#: src/tar.c:565 tests/genfile.c:152 +#: src/tar.c:564 tests/genfile.c:152 msgid "FORMAT" msgstr "格式" -#: src/tar.c:566 +#: src/tar.c:565 #, fuzzy msgid "create archive of the given format" msgstr "以給定格式建立保存檔。" -#: src/tar.c:568 +#: src/tar.c:567 msgid "FORMAT is one of the following:" msgstr "符合下列任一格式:" -#: src/tar.c:569 +#: src/tar.c:568 msgid "old V7 tar format" msgstr "舊式 V7 tar 格式" -#: src/tar.c:572 +#: src/tar.c:571 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 之 GNU 格式" -#: src/tar.c:574 +#: src/tar.c:573 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x 格式" -#: src/tar.c:576 +#: src/tar.c:575 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) 格式" -#: src/tar.c:578 +#: src/tar.c:577 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) 格式" -#: src/tar.c:579 +#: src/tar.c:578 #, fuzzy msgid "same as pax" msgstr "等同 pax" -#: src/tar.c:582 +#: src/tar.c:581 msgid "same as --format=v7" msgstr "等同 --format=v7" -#: src/tar.c:585 +#: src/tar.c:584 msgid "same as --format=posix" msgstr "等同 --format=posix" -#: src/tar.c:586 +#: src/tar.c:585 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "關鍵字[[:]=值][,關鍵字[[:]=值], ...]" -#: src/tar.c:587 +#: src/tar.c:586 msgid "control pax keywords" msgstr "控制 pax 的關鍵字" -#: src/tar.c:588 +#: src/tar.c:587 msgid "TEXT" msgstr "文字" -#: src/tar.c:589 +#: src/tar.c:588 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " @@ -1701,191 +1714,196 @@ msgid "" msgstr "" "以卷冊名稱 NAME 來建立保存檔。在列表/解開時，使用 TEXT 做為萬用比對樣式" -#: src/tar.c:594 +#: src/tar.c:593 #, fuzzy msgid "Compression options:" msgstr "有關壓縮的選項互相抵觸" -#: src/tar.c:596 +#: src/tar.c:595 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:598 -msgid "do not use use archive suffix to determine the compression program" +#: src/tar.c:597 +msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:601 +#: src/tar.c:600 msgid "filter the archive through bzip2" msgstr "保存檔以 bzip2 過濾處理" -#: src/tar.c:603 +#: src/tar.c:602 msgid "filter the archive through gzip" msgstr "保存檔以 gzip 過濾處理" -#: src/tar.c:607 +#: src/tar.c:606 msgid "filter the archive through compress" msgstr "保存檔以 compress 過濾處理" -#: src/tar.c:610 +#: src/tar.c:609 #, fuzzy msgid "filter the archive through lzma" msgstr "保存檔以 gzip 過濾處理" -#: src/tar.c:612 +#: src/tar.c:611 #, fuzzy msgid "filter the archive through lzop" msgstr "保存檔以 gzip 過濾處理" #: src/tar.c:613 +#, fuzzy +msgid "filter the archive through xz" +msgstr "保存檔以 gzip 過濾處理" + +#: src/tar.c:614 msgid "PROG" msgstr "程式" -#: src/tar.c:614 +#: src/tar.c:615 msgid "filter through PROG (must accept -d)" msgstr "以 PROG 過濾處理 (必須接受 -d)" -#: src/tar.c:619 +#: src/tar.c:620 msgid "Local file selection:" msgstr "本機檔案選擇:" -#: src/tar.c:622 +#: src/tar.c:623 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:623 +#: src/tar.c:624 msgid "DIR" msgstr "目錄" -#: src/tar.c:624 +#: src/tar.c:625 msgid "change to directory DIR" msgstr "更改至目錄 DIR" -#: src/tar.c:626 +#: src/tar.c:627 #, fuzzy msgid "get names to extract or create from FILE" msgstr "從檔案 NAME 中取得要解開或建立的名稱" -#: src/tar.c:628 +#: src/tar.c:629 msgid "-T reads null-terminated names, disable -C" msgstr "-T 讀取零值終結的名稱，停用 -C" -#: src/tar.c:630 +#: src/tar.c:631 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:632 +#: src/tar.c:633 msgid "unquote filenames read with -T (default)" msgstr "" -#: src/tar.c:634 +#: src/tar.c:635 msgid "do not unquote filenames read with -T" msgstr "" -#: src/tar.c:635 tests/genfile.c:135 +#: src/tar.c:636 tests/genfile.c:135 msgid "PATTERN" msgstr "樣式" -#: src/tar.c:636 +#: src/tar.c:637 msgid "exclude files, given as a PATTERN" msgstr "排除給定樣式的檔案" -#: src/tar.c:638 +#: src/tar.c:639 msgid "exclude patterns listed in FILE" msgstr "排除 FILE 中所列出的樣式" -#: src/tar.c:640 +#: src/tar.c:641 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:643 +#: src/tar.c:644 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:646 +#: src/tar.c:647 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:648 +#: src/tar.c:649 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:651 +#: src/tar.c:652 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:653 +#: src/tar.c:654 #, fuzzy msgid "exclude directories containing FILE" msgstr "排除包含了快取標記的目錄" -#: src/tar.c:655 +#: src/tar.c:656 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:657 +#: src/tar.c:658 msgid "avoid descending automatically in directories" msgstr "避免自動在目錄中下降" -#: src/tar.c:659 +#: src/tar.c:660 msgid "stay in local file system when creating archive" msgstr "建立保存檔時保持在本地檔案系統中" -#: src/tar.c:661 +#: src/tar.c:662 msgid "recurse into directories (default)" msgstr "遞迴進入目錄 (預設)" -#: src/tar.c:663 +#: src/tar.c:664 msgid "don't strip leading `/'s from file names" msgstr "不要從檔案名稱中截去前導的 '/'" -#: src/tar.c:665 +#: src/tar.c:666 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:667 +#: src/tar.c:668 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:668 +#: src/tar.c:669 msgid "MEMBER-NAME" msgstr "成員-名稱" -#: src/tar.c:669 +#: src/tar.c:670 msgid "begin at member MEMBER-NAME in the archive" msgstr "從保存檔中名為 MEMBER-NAME 的成員開始" -#: src/tar.c:671 +#: src/tar.c:672 msgid "only store files newer than DATE-OR-FILE" msgstr "只儲存比 DATE-OF-FILE 還新的檔案" -#: src/tar.c:673 +#: src/tar.c:674 msgid "DATE" msgstr "日期" -#: src/tar.c:674 +#: src/tar.c:675 msgid "compare date and time when data changed only" msgstr "只有當資料變更時才比較日期和時間" -#: src/tar.c:675 +#: src/tar.c:676 msgid "CONTROL" msgstr "控制" -#: src/tar.c:676 +#: src/tar.c:677 msgid "backup before removal, choose version CONTROL" msgstr "移除前先備份，選擇版本 CONTROL" -#: src/tar.c:677 src/tar.c:752 src/tar.c:754 tests/genfile.c:168 +#: src/tar.c:678 src/tar.c:753 src/tar.c:755 tests/genfile.c:168 msgid "STRING" msgstr "字串" -#: src/tar.c:678 +#: src/tar.c:679 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -1894,95 +1912,95 @@ msgstr "" "移除前先備份並覆蓋一般後置文字 '~'，除非被環境變數 SIMPLE_BACKUP_SUFFIX 所覆" "蓋" -#: src/tar.c:683 +#: src/tar.c:684 msgid "File name transformations:" msgstr "" -#: src/tar.c:685 +#: src/tar.c:686 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "從檔案名稱中截去以 NUMBER 為首的成分" -#: src/tar.c:687 +#: src/tar.c:688 msgid "EXPRESSION" msgstr "" -#: src/tar.c:688 +#: src/tar.c:689 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:694 +#: src/tar.c:695 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:697 +#: src/tar.c:698 #, fuzzy msgid "ignore case" msgstr "排除時忽略大小寫" -#: src/tar.c:699 +#: src/tar.c:700 #, fuzzy msgid "patterns match file name start" msgstr "排除樣式會比對檔案名稱開頭" -#: src/tar.c:701 +#: src/tar.c:702 #, fuzzy msgid "patterns match after any `/' (default for exclusion)" msgstr "排除樣式會比對任一 '/' 後端 (預設)" -#: src/tar.c:703 +#: src/tar.c:704 #, fuzzy msgid "case sensitive matching (default)" msgstr "排除樣式忽略大小寫" -#: src/tar.c:705 +#: src/tar.c:706 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:707 +#: src/tar.c:708 msgid "verbatim string matching" msgstr "" -#: src/tar.c:709 +#: src/tar.c:710 #, fuzzy msgid "wildcards do not match `/'" msgstr "排除樣式之萬用字元不會符合 '/'" -#: src/tar.c:711 +#: src/tar.c:712 #, fuzzy msgid "wildcards match `/' (default for exclusion)" msgstr "排除樣式之萬用字元會符合 '/' (預設)" -#: src/tar.c:716 +#: src/tar.c:717 msgid "Informative output:" msgstr "富含資訊的輸出:" -#: src/tar.c:719 +#: src/tar.c:720 msgid "verbosely list files processed" msgstr "詳細列出處理過的檔案" -#: src/tar.c:721 +#: src/tar.c:722 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "每 10 項紀錄顯示一次進度訊息" -#: src/tar.c:723 +#: src/tar.c:724 msgid "ACTION" msgstr "" -#: src/tar.c:724 +#: src/tar.c:725 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:727 +#: src/tar.c:728 msgid "print a message if not all links are dumped" msgstr "如果並非所有連結都被傾印則印出一條訊息" -#: src/tar.c:728 +#: src/tar.c:729 msgid "SIGNAL" msgstr "" -#: src/tar.c:729 +#: src/tar.c:730 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -1990,116 +2008,116 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:734 +#: src/tar.c:735 msgid "print file modification dates in UTC" msgstr "以 UTC 格式印出檔案修改日期" -#: src/tar.c:736 +#: src/tar.c:737 msgid "send verbose output to FILE" msgstr "將詳細輸出送至 FILE" -#: src/tar.c:738 +#: src/tar.c:739 msgid "show block number within archive with each message" msgstr "每則訊息附帶顯示在保存檔中的區塊號碼" -#: src/tar.c:740 +#: src/tar.c:741 msgid "ask for confirmation for every action" msgstr "任何動作都要求確認" -#: src/tar.c:743 +#: src/tar.c:744 #, fuzzy msgid "show tar defaults" msgstr "顯示 tar 預設值" -#: src/tar.c:745 +#: src/tar.c:746 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "當表列或解開時，列出每一個不符合搜尋條件的目錄" -#: src/tar.c:747 +#: src/tar.c:748 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:750 +#: src/tar.c:751 msgid "STYLE" msgstr "" -#: src/tar.c:751 +#: src/tar.c:752 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:753 +#: src/tar.c:754 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:755 +#: src/tar.c:756 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:760 +#: src/tar.c:761 msgid "Compatibility options:" msgstr "相容性選項:" -#: src/tar.c:763 +#: src/tar.c:764 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "當建立時，等同於 --old-archive。當解開時，等同於 --no-same-owner" -#: src/tar.c:768 +#: src/tar.c:769 msgid "Other options:" msgstr "其他選項:" -#: src/tar.c:771 +#: src/tar.c:772 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:919 +#: src/tar.c:920 msgid "You may not specify more than one `-Acdtrux' option" msgstr "不可指定‘-Acdtrux’當中多於一個的選項" -#: src/tar.c:929 +#: src/tar.c:930 msgid "Conflicting compression options" msgstr "有關壓縮的選項互相抵觸" -#: src/tar.c:985 +#: src/tar.c:986 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "不明的檔案類型 %s\n" -#: src/tar.c:1009 +#: src/tar.c:1010 #, fuzzy msgid "Date sample file not found" msgstr "找不到用作擷取時間資料的檔案" -#: src/tar.c:1017 +#: src/tar.c:1018 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "以 %s 代替不明的日期格式 %s" -#: src/tar.c:1042 +#: src/tar.c:1043 #, fuzzy, c-format msgid "Option %s: Treating date `%s' as %s" msgstr "以 %2$s + %3$ld 柰秒的格式來處理日期 '%1$s'" -#: src/tar.c:1119 +#: src/tar.c:1120 #, fuzzy, c-format msgid "%s: file list already read" msgstr "%s：這個檔案是保存檔；未傾印" -#: src/tar.c:1184 +#: src/tar.c:1185 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/tar.c:1249 +#: src/tar.c:1250 msgid "Valid arguments for --quoting-style options are:" msgstr "" -#: src/tar.c:1252 +#: src/tar.c:1253 msgid "" "\n" "*This* tar defaults to:\n" @@ -2107,162 +2125,158 @@ msgstr "" "\n" "*這個* tar 預設為:\n" -#: src/tar.c:1293 +#: src/tar.c:1294 msgid "Invalid blocking factor" msgstr "無效的分區因素" -#: 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:1406 +#: src/tar.c:1401 msgid "Invalid tape length" msgstr "無效的磁帶長度" -#: src/tar.c:1442 +#: src/tar.c:1441 msgid "More than one threshold date" msgstr "一個以上的限定日期" -#: src/tar.c:1497 src/tar.c:1500 +#: src/tar.c:1496 src/tar.c:1499 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1585 +#: src/tar.c:1584 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1610 +#: src/tar.c:1609 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1711 +#: src/tar.c:1710 #, c-format msgid "%s: Invalid group" msgstr "%s：無效的群組" -#: src/tar.c:1718 +#: src/tar.c:1717 msgid "Invalid mode given on option" msgstr "選項中的模式無效" -#: src/tar.c:1775 +#: src/tar.c:1774 msgid "Invalid number" msgstr "無效的號碼" -#: src/tar.c:1797 +#: src/tar.c:1796 msgid "Invalid owner" msgstr "無效的擁有者" -#: src/tar.c:1823 +#: src/tar.c:1822 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1833 +#: src/tar.c:1832 msgid "Invalid record size" msgstr "無效的紀錄大小" -#: src/tar.c:1836 +#: src/tar.c:1835 #, c-format msgid "Record size must be a multiple of %d." msgstr "紀錄大小必須是 %d 的倍數。" -#: src/tar.c:1873 +#: src/tar.c:1872 msgid "Invalid number of elements" msgstr "無效的元素號碼" -#: src/tar.c:1893 +#: src/tar.c:1892 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:1969 +#: src/tar.c:1968 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "未成形的密度引數: '%s'" -#: src/tar.c:1995 +#: src/tar.c:1994 #, fuzzy, c-format msgid "Unknown density: `%c'" msgstr "未知的密度: '%c'" -#: src/tar.c:2012 +#: src/tar.c:2011 #, c-format msgid "Options `-[0-7][lmh]' not supported by *this* tar" msgstr "此版本的 tar 不支援‘-[0-7][lmh]’選項" -#: src/tar.c:2047 +#: src/tar.c:2046 msgid "[FILE]..." msgstr "[FILE]..." -#: src/tar.c:2153 +#: src/tar.c:2152 #, c-format msgid "Old option `%c' requires an argument." msgstr "舊式的選項‘%c’需要引數。" -#: src/tar.c:2235 +#: src/tar.c:2234 msgid "--occurrence is meaningless without a file list" msgstr "若無檔案列表，--occurrence 便不具意義" -#: src/tar.c:2241 +#: src/tar.c:2240 msgid "--occurrence cannot be used in the requested operation mode" msgstr "--occurrence 不可使用於要求的作業模式" -#: src/tar.c:2271 +#: src/tar.c:2270 msgid "Multiple archive files require `-M' option" msgstr "指定多個保存檔時需要‘-M’選項" -#: src/tar.c:2276 +#: src/tar.c:2275 msgid "Cannot combine --listed-incremental with --newer" msgstr "無法同時使用 --listed-incremental 及 --newer 選項" -#: src/tar.c:2293 +#: src/tar.c:2292 #, 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:2306 +#: src/tar.c:2305 msgid "Cannot verify multi-volume archives" msgstr "無法檢驗多重卷冊的保存檔" -#: src/tar.c:2308 +#: src/tar.c:2307 msgid "Cannot verify compressed archives" msgstr "無法檢驗壓縮的保存檔" -#: src/tar.c:2314 +#: src/tar.c:2313 msgid "Cannot use multi-volume compressed archives" msgstr "無法使用多重卷冊的壓縮保存檔" -#: src/tar.c:2320 +#: src/tar.c:2319 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "無法更新壓縮的保存檔" -#: src/tar.c:2332 +#: src/tar.c:2331 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option 只能用於 POSIX 保存檔" -#: src/tar.c:2350 +#: src/tar.c:2349 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2353 +#: src/tar.c:2352 msgid "--preserve-order is not compatible with --listed-incremental" msgstr "" -#: src/tar.c:2364 +#: src/tar.c:2363 msgid "Cowardly refusing to create an empty archive" msgstr "拒絕建立空白的保存檔" -#: src/tar.c:2389 +#: src/tar.c:2388 msgid "Options `-Aru' are incompatible with `-f -'" msgstr "‘-Aru’及‘-f -’選項互不兼容" -#: src/tar.c:2478 +#: src/tar.c:2477 msgid "You must specify one of the `-Acdtrux' options" msgstr "必須指定‘-Acdtrux’選項的其中一個" -#: src/tar.c:2529 +#: src/tar.c:2528 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" @@ -2620,6 +2634,9 @@ msgstr "--損毀的檔案名稱--\n" msgid "too many arguments" msgstr "" +#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" +#~ msgstr "警告：不再支援 -I 選項；也許你是指 -j 或 -T 選項？" + #~ msgid "block size" #~ msgstr "區塊大小" diff --git a/rmt/Makefile.in b/rmt/Makefile.in index 5478926..a2c43b4 100644 --- a/rmt/Makefile.in +++ b/rmt/Makefile.in @@ -36,9 +36,10 @@ EXTRA_PROGRAMS = rmt$(EXEEXT) subdir = rmt DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ @@ -71,50 +72,52 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbscasecmp.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ + $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbscasecmp.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.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/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/multiarch.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/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/size_max.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/wcrtomb.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 \ @@ -149,6 +152,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -197,11 +201,14 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DIRFD = @GNULIB_DIRFD@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ @@ -236,19 +243,25 @@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LINK = @GNULIB_LINK@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ GNULIB_MBSCHR = @GNULIB_MBSCHR@ GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ GNULIB_MBSLEN = @GNULIB_MBSLEN@ GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ @@ -273,6 +286,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANDIR = @GNULIB_SCANDIR@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ @@ -300,16 +314,23 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ 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_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ATOLL = @HAVE_ATOLL@ +HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ @@ -333,7 +354,9 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ @@ -349,17 +372,25 @@ HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHMOD = @HAVE_LCHMOD@ +HAVE_LINK = @HAVE_LINK@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ +HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOWC = @HAVE_MBRTOWC@ +HAVE_MBSINIT = @HAVE_MBSINIT@ +HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_H = @HAVE_RANDOM_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_SCANDIR = @HAVE_SCANDIR@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -391,11 +422,16 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ +HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ +HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ INCLUDE_NEXT = @INCLUDE_NEXT@ +INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -414,8 +450,13 @@ LIBS = @LIBS@ LIBTAR_LIBDEPS = @LIBTAR_LIBDEPS@ LIBTAR_LTLIBDEPS = @LIBTAR_LTLIBDEPS@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_CLOSE = @LIB_CLOSE@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOCALE_FR = @LOCALE_FR@ +LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ +LOCALE_JA = @LOCALE_JA@ +LOCALE_ZH_CN = @LOCALE_ZH_CN@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -457,8 +498,10 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ +REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ @@ -478,6 +521,12 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ +REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +REPLACE_MBSINIT = @REPLACE_MBSINIT@ +REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ @@ -499,10 +548,14 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ +REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ +REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 5a72416..3d88476 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -37,9 +37,10 @@ host_triplet = @host@ subdir = scripts DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ @@ -72,50 +73,52 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbscasecmp.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ + $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbscasecmp.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.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/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/multiarch.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/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/size_max.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/wcrtomb.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 \ @@ -137,6 +140,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -185,11 +189,14 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DIRFD = @GNULIB_DIRFD@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ @@ -224,19 +231,25 @@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LINK = @GNULIB_LINK@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ GNULIB_MBSCHR = @GNULIB_MBSCHR@ GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ GNULIB_MBSLEN = @GNULIB_MBSLEN@ GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ @@ -261,6 +274,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANDIR = @GNULIB_SCANDIR@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ @@ -288,16 +302,23 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ 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_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ATOLL = @HAVE_ATOLL@ +HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ @@ -321,7 +342,9 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ @@ -337,17 +360,25 @@ HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHMOD = @HAVE_LCHMOD@ +HAVE_LINK = @HAVE_LINK@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ +HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOWC = @HAVE_MBRTOWC@ +HAVE_MBSINIT = @HAVE_MBSINIT@ +HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_H = @HAVE_RANDOM_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_SCANDIR = @HAVE_SCANDIR@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -379,11 +410,16 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ +HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ +HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ INCLUDE_NEXT = @INCLUDE_NEXT@ +INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -402,8 +438,13 @@ LIBS = @LIBS@ LIBTAR_LIBDEPS = @LIBTAR_LIBDEPS@ LIBTAR_LTLIBDEPS = @LIBTAR_LTLIBDEPS@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_CLOSE = @LIB_CLOSE@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOCALE_FR = @LOCALE_FR@ +LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ +LOCALE_JA = @LOCALE_JA@ +LOCALE_ZH_CN = @LOCALE_ZH_CN@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -445,8 +486,10 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ +REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ @@ -466,6 +509,12 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ +REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +REPLACE_MBSINIT = @REPLACE_MBSINIT@ +REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ @@ -487,10 +536,14 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ +REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ +REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ diff --git a/src/Makefile.in b/src/Makefile.in index 66edf30..aafc1d2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -43,9 +43,10 @@ subdir = src DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ @@ -78,50 +79,52 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbscasecmp.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ + $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbscasecmp.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.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/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/multiarch.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/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/size_max.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/wcrtomb.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 \ @@ -163,6 +166,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -211,11 +215,14 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DIRFD = @GNULIB_DIRFD@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ @@ -250,19 +257,25 @@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LINK = @GNULIB_LINK@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ GNULIB_MBSCHR = @GNULIB_MBSCHR@ GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ GNULIB_MBSLEN = @GNULIB_MBSLEN@ GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ @@ -287,6 +300,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANDIR = @GNULIB_SCANDIR@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ @@ -314,16 +328,23 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ 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_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ATOLL = @HAVE_ATOLL@ +HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ @@ -347,7 +368,9 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ @@ -363,17 +386,25 @@ HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHMOD = @HAVE_LCHMOD@ +HAVE_LINK = @HAVE_LINK@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ +HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOWC = @HAVE_MBRTOWC@ +HAVE_MBSINIT = @HAVE_MBSINIT@ +HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_H = @HAVE_RANDOM_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_SCANDIR = @HAVE_SCANDIR@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -405,11 +436,16 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ +HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ +HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ INCLUDE_NEXT = @INCLUDE_NEXT@ +INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -428,8 +464,13 @@ LIBS = @LIBS@ LIBTAR_LIBDEPS = @LIBTAR_LIBDEPS@ LIBTAR_LTLIBDEPS = @LIBTAR_LTLIBDEPS@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_CLOSE = @LIB_CLOSE@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOCALE_FR = @LOCALE_FR@ +LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ +LOCALE_JA = @LOCALE_JA@ +LOCALE_ZH_CN = @LOCALE_ZH_CN@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -471,8 +512,10 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ +REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ @@ -492,6 +535,12 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ +REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +REPLACE_MBSINIT = @REPLACE_MBSINIT@ +REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ @@ -513,10 +562,14 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ +REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ +REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ diff --git a/src/buffer.c b/src/buffer.c index 5f5457a..8edc257 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, 2008 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Written by John Gilmore, on 1985-08-25. @@ -204,7 +204,8 @@ enum compress_type { ct_gzip, ct_bzip2, ct_lzma, - ct_lzop + ct_lzop, + ct_xz }; struct zip_magic @@ -222,8 +223,9 @@ static struct zip_magic const magic[] = { { 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", "-J" }, /* FIXME: ???? */ + { ct_lzma, 6, "\xFFLZMA", "lzma", "--lzma" }, /* FIXME: ???? */ { ct_lzop, 4, "\211LZO", "lzop", "--lzop" }, + { ct_xz, 6, "\0xFD7zXZ", "-J" }, }; #define NMAGIC (sizeof(magic)/sizeof(magic[0])) diff --git a/src/incremen.c b/src/incremen.c index 7e1e366..cd32e19 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -407,11 +407,14 @@ update_parent_directory (const char *name) free (p); } +#define PD_VERBOSE 0x10 +#define PD_FORCE_CHILDREN 0x20 +#define PD_CHILDREN(f) ((f) & 3) + static struct directory * procdir (char *name_buffer, struct stat *stat_data, dev_t device, - enum children children, - bool verbose, + int flag, char *entry) { struct directory *directory; @@ -485,7 +488,7 @@ procdir (char *name_buffer, struct stat *stat_data, { if (strcmp (d->name, name_buffer)) { - if (verbose) + if (flag & PD_VERBOSE) WARN ((0, 0, _("%s: Directory has been renamed from %s"), quotearg_colon (name_buffer), quote_n (1, d->name))); @@ -498,7 +501,7 @@ procdir (char *name_buffer, struct stat *stat_data, else { DIR_SET_FLAG (directory, DIRF_NEW); - if (verbose) + if (flag & PD_VERBOSE) WARN ((0, 0, _("%s: Directory is new"), quotearg_colon (name_buffer))); directory->children = @@ -517,43 +520,48 @@ procdir (char *name_buffer, struct stat *stat_data, /* ... except if it was explicitely given in the command line */ && !is_individual_file (name_buffer)) directory->children = NO_CHILDREN; - else if (children == ALL_CHILDREN) - directory->children = ALL_CHILDREN; - + else if (flag & PD_FORCE_CHILDREN) + { + directory->children = PD_CHILDREN(flag); + if (directory->children == NO_CHILDREN) + *entry = 'N'; + } + DIR_SET_FLAG (directory, DIRF_INIT); - { - const char *tag_file_name; - - switch (check_exclusion_tags (name_buffer, &tag_file_name)) - { - case exclusion_tag_all: - /* This warning can be duplicated by code in dump_file0, but only - in case when the topmost directory being archived contains - an exclusion tag. */ - exclusion_tag_warning (name_buffer, tag_file_name, - _("directory not dumped")); - if (entry) - *entry = 'N'; - directory->children = NO_CHILDREN; - break; - - case exclusion_tag_contents: - exclusion_tag_warning (name_buffer, tag_file_name, - _("contents not dumped")); - directory->children = NO_CHILDREN; - break; + if (directory->children != NO_CHILDREN) + { + const char *tag_file_name; - case exclusion_tag_under: - exclusion_tag_warning (name_buffer, tag_file_name, - _("contents not dumped")); - directory->tagfile = tag_file_name; - break; + switch (check_exclusion_tags (name_buffer, &tag_file_name)) + { + case exclusion_tag_all: + /* This warning can be duplicated by code in dump_file0, but only + in case when the topmost directory being archived contains + an exclusion tag. */ + exclusion_tag_warning (name_buffer, tag_file_name, + _("directory not dumped")); + if (entry) + *entry = 'N'; + directory->children = NO_CHILDREN; + break; - case exclusion_tag_none: - break; - } - } + case exclusion_tag_contents: + exclusion_tag_warning (name_buffer, tag_file_name, + _("contents not dumped")); + directory->children = NO_CHILDREN; + break; + + case exclusion_tag_under: + exclusion_tag_warning (name_buffer, tag_file_name, + _("contents not dumped")); + directory->tagfile = tag_file_name; + break; + + case exclusion_tag_none: + break; + } + } return directory; } @@ -645,7 +653,7 @@ scan_directory (char *dir, dev_t device) size_t name_length; /* used length in name_buffer */ struct stat stat_data; struct directory *directory; - + if (! dirp) savedir_error (dir); @@ -667,8 +675,7 @@ scan_directory (char *dir, dev_t device) return NULL; } - directory = procdir (name_buffer, &stat_data, device, NO_CHILDREN, false, - NULL); + directory = procdir (name_buffer, &stat_data, device, 0, NULL); if (dirp && directory->children != NO_CHILDREN) { @@ -707,10 +714,13 @@ scan_directory (char *dir, dev_t device) if (S_ISDIR (stat_data.st_mode)) { + int pd_flag = (verbose_option ? PD_VERBOSE : 0); + if (!recursion_option) + pd_flag |= PD_FORCE_CHILDREN | NO_CHILDREN; + else if (directory->children == ALL_CHILDREN) + pd_flag |= PD_FORCE_CHILDREN | ALL_CHILDREN; *entry = 'D'; - procdir (name_buffer, &stat_data, device, - directory->children, - verbose_option, entry); + procdir (name_buffer, &stat_data, device, pd_flag, entry); } else if (one_file_system_option && device != stat_data.st_dev) diff --git a/src/suffix.c b/src/suffix.c index 986f347..6dbc68e 100644 --- a/src/suffix.c +++ b/src/suffix.c @@ -1,5 +1,5 @@ /* This file is part of GNU tar. - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007, 2009 Free Software Foundation, Inc. Written by Sergey Poznyakoff. @@ -40,6 +40,7 @@ struct compression_suffix compression_suffixes[] = { { S(lzma, lzma) }, { S(tlz, lzma) }, { S(lzo, lzop) }, + { S(xz, xz) }, #undef S }; diff --git a/src/tar.c b/src/tar.c index ae0c739..dbffc2a 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,7 +1,7 @@ /* A tar (tape archiver) program. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, - 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2001, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. Written by John Gilmore, starting 1985-08-25. @@ -271,6 +271,7 @@ enum IGNORE_FAILED_READ_OPTION, INDEX_FILE_OPTION, KEEP_NEWER_FILES_OPTION, + LZMA_OPTION, LZOP_OPTION, MODE_OPTION, MTIME_OPTION, @@ -323,7 +324,6 @@ enum TRANSFORM_OPTION, UNQUOTE_OPTION, USAGE_OPTION, - USE_COMPRESS_PROGRAM_OPTION, UTC_OPTION, VERSION_OPTION, VOLNO_FILE_OPTION, @@ -352,7 +352,7 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n /* NOTE: - Available option letters are DEIQY and eqy. Consider the following + Available option letters are DEQY and eqy. Consider the following assignments: [For Solaris tar compatibility =/= Is it important at all?] @@ -360,7 +360,6 @@ The version control may be set with --backup or VERSION_CONTROL, values are:\n\n E use extended headers (--format=posix) [q alias for --occurrence=1 =/= this would better be used for quiet?] - [I same as T =/= will harm star compatibility] y per-file gzip compression Y per-block gzip compression */ @@ -595,7 +594,7 @@ static struct argp_option options[] = { {"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"), + N_("do not use archive suffix to determine the compression program"), GRID+1 }, {"bzip2", 'j', 0, 0, N_("filter the archive through bzip2"), GRID+1 }, @@ -606,11 +605,13 @@ 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", 'J', 0, 0, + {"lzma", LZMA_OPTION, 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, + {"xz", 'J', 0, 0, + N_("filter the archive through xz"), GRID+8 }, + {"use-compress-program", 'I', N_("PROG"), 0, N_("filter through PROG (must accept -d)"), GRID+1 }, #undef GRID @@ -1364,18 +1365,12 @@ parse_opt (int key, char *arg, struct argp_state *state) ignore_zeros_option = true; break; - case 'I': - USAGE_ERROR ((0, 0, - _("Warning: the -I option is not supported;" - " perhaps you meant -j or -T?"))); - break; - case 'j': set_use_compress_program_option ("bzip2"); break; case 'J': - set_use_compress_program_option ("lzma"); + set_use_compress_program_option ("xz"); break; case 'k': @@ -1409,6 +1404,10 @@ parse_opt (int key, char *arg, struct argp_state *state) } break; + case LZMA_OPTION: + set_use_compress_program_option ("lzma"); + break; + case LZOP_OPTION: set_use_compress_program_option ("lzop"); break; @@ -1905,7 +1904,7 @@ parse_opt (int key, char *arg, struct argp_state *state) set_transform_expr (arg); break; - case USE_COMPRESS_PROGRAM_OPTION: + case 'I': set_use_compress_program_option (arg); break; diff --git a/tests/Makefile.in b/tests/Makefile.in index ba2b879..d2ecc24 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -44,9 +44,10 @@ subdir = tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/atlocal.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argmatch.m4 $(top_srcdir)/m4/argp.m4 \ - $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argmatch.m4 \ + $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ + $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ $(top_srcdir)/m4/canonicalize-lgpl.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ @@ -79,50 +80,52 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/longlong.m4 \ - $(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \ - $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbscasecmp.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/memchr.m4 \ - $(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \ - $(top_srcdir)/m4/memset.m4 $(top_srcdir)/m4/mkdtemp.m4 \ + $(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \ + $(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \ + $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ + $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbscasecmp.m4 $(top_srcdir)/m4/mbsinit.m4 \ + $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mempcpy.m4 \ + $(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \ $(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/modechange.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/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/multiarch.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/rawmemchr.m4 \ + $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.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/setenv.m4 $(top_srcdir)/m4/size_max.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/wcrtomb.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 \ @@ -155,6 +158,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOM4TE = @AUTOM4TE@ @@ -203,11 +207,14 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ +GNULIB_ALPHASORT = @GNULIB_ALPHASORT@ GNULIB_ATOLL = @GNULIB_ATOLL@ +GNULIB_BTOWC = @GNULIB_BTOWC@ GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_DIRFD = @GNULIB_DIRFD@ +GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP2 = @GNULIB_DUP2@ GNULIB_ENVIRON = @GNULIB_ENVIRON@ GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@ @@ -242,19 +249,25 @@ GNULIB_IMAXABS = @GNULIB_IMAXABS@ GNULIB_IMAXDIV = @GNULIB_IMAXDIV@ GNULIB_LCHMOD = @GNULIB_LCHMOD@ GNULIB_LCHOWN = @GNULIB_LCHOWN@ +GNULIB_LINK = @GNULIB_LINK@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ +GNULIB_MBRLEN = @GNULIB_MBRLEN@ +GNULIB_MBRTOWC = @GNULIB_MBRTOWC@ GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@ GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@ GNULIB_MBSCHR = @GNULIB_MBSCHR@ GNULIB_MBSCSPN = @GNULIB_MBSCSPN@ +GNULIB_MBSINIT = @GNULIB_MBSINIT@ GNULIB_MBSLEN = @GNULIB_MBSLEN@ GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@ GNULIB_MBSNLEN = @GNULIB_MBSNLEN@ +GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@ GNULIB_MBSPBRK = @GNULIB_MBSPBRK@ GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@ GNULIB_MBSRCHR = @GNULIB_MBSRCHR@ +GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@ GNULIB_MBSSEP = @GNULIB_MBSSEP@ GNULIB_MBSSPN = @GNULIB_MBSSPN@ GNULIB_MBSSTR = @GNULIB_MBSSTR@ @@ -279,6 +292,7 @@ GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@ GNULIB_READLINK = @GNULIB_READLINK@ GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@ GNULIB_RPMATCH = @GNULIB_RPMATCH@ +GNULIB_SCANDIR = @GNULIB_SCANDIR@ GNULIB_SETENV = @GNULIB_SETENV@ GNULIB_SLEEP = @GNULIB_SLEEP@ GNULIB_SNPRINTF = @GNULIB_SNPRINTF@ @@ -306,16 +320,23 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNSETENV = @GNULIB_UNSETENV@ GNULIB_VASPRINTF = @GNULIB_VASPRINTF@ +GNULIB_VDPRINTF = @GNULIB_VDPRINTF@ 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_WCRTOMB = @GNULIB_WCRTOMB@ +GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@ +GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@ +GNULIB_WCTOB = @GNULIB_WCTOB@ GNULIB_WCWIDTH = @GNULIB_WCWIDTH@ GNULIB_WRITE = @GNULIB_WRITE@ GREP = @GREP@ +HAVE_ALPHASORT = @HAVE_ALPHASORT@ HAVE_ATOLL = @HAVE_ATOLL@ +HAVE_BTOWC = @HAVE_BTOWC@ HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@ HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ @@ -339,7 +360,9 @@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@ +HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@ HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@ +HAVE_DPRINTF = @HAVE_DPRINTF@ HAVE_DUP2 = @HAVE_DUP2@ HAVE_EUIDACCESS = @HAVE_EUIDACCESS@ HAVE_FSEEKO = @HAVE_FSEEKO@ @@ -355,17 +378,25 @@ HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@ HAVE_INTTYPES_H = @HAVE_INTTYPES_H@ HAVE_ISWCNTRL = @HAVE_ISWCNTRL@ HAVE_LCHMOD = @HAVE_LCHMOD@ +HAVE_LINK = @HAVE_LINK@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@ +HAVE_MBRLEN = @HAVE_MBRLEN@ +HAVE_MBRTOWC = @HAVE_MBRTOWC@ +HAVE_MBSINIT = @HAVE_MBSINIT@ +HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@ +HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@ HAVE_MEMPCPY = @HAVE_MEMPCPY@ HAVE_MKDTEMP = @HAVE_MKDTEMP@ HAVE_OS_H = @HAVE_OS_H@ +HAVE_RANDOM_H = @HAVE_RANDOM_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_SCANDIR = @HAVE_SCANDIR@ HAVE_SETENV = @HAVE_SETENV@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@ HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@ @@ -397,11 +428,16 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNSETENV = @HAVE_UNSETENV@ HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@ HAVE_VASPRINTF = @HAVE_VASPRINTF@ +HAVE_VDPRINTF = @HAVE_VDPRINTF@ HAVE_WCHAR_H = @HAVE_WCHAR_H@ +HAVE_WCRTOMB = @HAVE_WCRTOMB@ +HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@ +HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@ HAVE_WCTYPE_H = @HAVE_WCTYPE_H@ HAVE_WINT_T = @HAVE_WINT_T@ HAVE__BOOL = @HAVE__BOOL@ INCLUDE_NEXT = @INCLUDE_NEXT@ +INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -420,8 +456,13 @@ LIBS = @LIBS@ LIBTAR_LIBDEPS = @LIBTAR_LIBDEPS@ LIBTAR_LTLIBDEPS = @LIBTAR_LTLIBDEPS@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_CLOSE = @LIB_CLOSE@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ +LOCALE_FR = @LOCALE_FR@ +LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ +LOCALE_JA = @LOCALE_JA@ +LOCALE_ZH_CN = @LOCALE_ZH_CN@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -463,8 +504,10 @@ PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ PU_RMT_PROG = @PU_RMT_PROG@ RANLIB = @RANLIB@ +REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_FCHDIR = @REPLACE_FCHDIR@ REPLACE_FCLOSE = @REPLACE_FCLOSE@ REPLACE_FFLUSH = @REPLACE_FFLUSH@ @@ -484,6 +527,12 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ +REPLACE_MBRLEN = @REPLACE_MBRLEN@ +REPLACE_MBRTOWC = @REPLACE_MBRTOWC@ +REPLACE_MBSINIT = @REPLACE_MBSINIT@ +REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@ +REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@ +REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@ REPLACE_MEMMEM = @REPLACE_MEMMEM@ REPLACE_MKDIR = @REPLACE_MKDIR@ REPLACE_MKSTEMP = @REPLACE_MKSTEMP@ @@ -505,10 +554,14 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_VASPRINTF = @REPLACE_VASPRINTF@ +REPLACE_VDPRINTF = @REPLACE_VDPRINTF@ REPLACE_VFPRINTF = @REPLACE_VFPRINTF@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ +REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ +REPLACE_WCTOB = @REPLACE_WCTOB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ SET_MAKE = @SET_MAKE@ diff --git a/tests/package.m4 b/tests/package.m4 index 0998247..30f5c90 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.21]) -m4_define([AT_PACKAGE_STRING], [GNU tar 1.21]) +m4_define([AT_PACKAGE_VERSION], [1.22]) +m4_define([AT_PACKAGE_STRING], [GNU tar 1.22]) m4_define([AT_PACKAGE_BUGREPORT], [bug-tar@gnu.org]) diff --git a/tests/pipe.at b/tests/pipe.at index efca65b..be99212 100644 --- a/tests/pipe.at +++ b/tests/pipe.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright (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 @@ -30,7 +30,8 @@ AT_SETUP([decompressing from stdin]) AT_KEYWORDS([pipe]) -AT_TAR_CHECK([ +AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK], +[AT_TAR_CHECK([ AT_SORT_PREREQ mkdir directory @@ -49,6 +50,7 @@ directory/file1 directory/file2 separator separator -]) +], +[stderr])]) AT_CLEANUP diff --git a/tests/shortrec.at b/tests/shortrec.at index 3e009fd..179f365 100644 --- a/tests/shortrec.at +++ b/tests/shortrec.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright (C) 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2005, 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,17 +23,22 @@ # used to create the archive. AT_SETUP([short records]) -AT_KEYWORDS([shortrec.at]) +AT_KEYWORDS([shortrec]) -AT_TAR_CHECK([ +AT_TAR_WITH_HOOK([TAR_IGNREC_HOOK], +[AT_TAR_CHECK([ mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory +], +[0], +[ignore], +[stderr]) ]) AT_CLEANUP diff --git a/tests/testsuite b/tests/testsuite index 880890c..a9b869c 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -681,7 +681,7 @@ at_help_all="1;version.at:19;tar version;; 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; +56;shortrec.at:25;short records;shortrec; 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; @@ -926,7 +926,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF -GNU tar 1.21 test suite test groups: +GNU tar 1.22 test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -950,7 +950,7 @@ _ATEOF exit 0 fi if $at_version_p; then - echo "$as_me (GNU tar 1.21)" + echo "$as_me (GNU tar 1.22)" cat <<\_ACEOF Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software @@ -1034,13 +1034,13 @@ exec 5>>"$at_suite_log" # Banners and logs. cat <<\_ASBOX ## ------------------------ ## -## GNU tar 1.21 test suite. ## +## GNU tar 1.22 test suite. ## ## ------------------------ ## _ASBOX { cat <<\_ASBOX ## ------------------------ ## -## GNU tar 1.21 test suite. ## +## GNU tar 1.22 test suite. ## ## ------------------------ ## _ASBOX echo @@ -1137,7 +1137,7 @@ IFS=$as_save_IFS if test -f "$as_dir/$at_program"; then { - echo "$at_srcdir/testsuite.at:92: $as_dir/$at_program --version" + echo "$at_srcdir/testsuite.at:104: $as_dir/$at_program --version" "$as_dir/$at_program" --version echo } >&5 2>&1 @@ -1310,7 +1310,7 @@ fi at_failed=false $at_diff "$at_devnull" "$at_stderr" || at_failed=: -echo >>"$at_stdout"; echo "tar (GNU tar) 1.21 +echo >>"$at_stdout"; echo "tar (GNU tar) 1.22 " | $at_diff - "$at_stdout" || at_failed=: case $at_status in 77) echo 77 > "$at_status_file"; exit 77;; @@ -1358,6 +1358,8 @@ $at_traceon + + $at_traceoff echo "$at_srcdir/pipe.at:33: mkdir v7 @@ -1444,7 +1446,7 @@ cmp orig/file2 directory/file2) ) >"$at_stdout" 2>"$at_stderr" fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo >>"$at_stdout"; echo "directory/ directory/file1 directory/file2 @@ -1465,6 +1467,45 @@ if $at_failed; then fi $at_traceon + + + $at_traceoff +echo "$at_srcdir/pipe.at:33: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo pipe.at:33 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +$at_diff "$at_devnull" "$at_stderr" || at_failed=: +$at_diff "$at_devnull" "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/pipe.at:33: 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/pipe.at:33: mkdir oldgnu @@ -1551,7 +1592,7 @@ cmp orig/file2 directory/file2) ) >"$at_stdout" 2>"$at_stderr" fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo >>"$at_stdout"; echo "directory/ directory/file1 directory/file2 @@ -1572,6 +1613,45 @@ if $at_failed; then fi $at_traceon + + + $at_traceoff +echo "$at_srcdir/pipe.at:33: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo pipe.at:33 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +$at_diff "$at_devnull" "$at_stderr" || at_failed=: +$at_diff "$at_devnull" "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/pipe.at:33: 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/pipe.at:33: mkdir ustar @@ -1658,7 +1738,7 @@ cmp orig/file2 directory/file2) ) >"$at_stdout" 2>"$at_stderr" fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo >>"$at_stdout"; echo "directory/ directory/file1 directory/file2 @@ -1679,6 +1759,45 @@ if $at_failed; then fi $at_traceon + + + $at_traceoff +echo "$at_srcdir/pipe.at:33: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo pipe.at:33 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +$at_diff "$at_devnull" "$at_stderr" || at_failed=: +$at_diff "$at_devnull" "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/pipe.at:33: 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/pipe.at:33: mkdir posix @@ -1765,7 +1884,7 @@ cmp orig/file2 directory/file2) ) >"$at_stdout" 2>"$at_stderr" fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo >>"$at_stdout"; echo "directory/ directory/file1 directory/file2 @@ -1786,6 +1905,45 @@ if $at_failed; then fi $at_traceon + + + $at_traceoff +echo "$at_srcdir/pipe.at:33: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo pipe.at:33 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +$at_diff "$at_devnull" "$at_stderr" || at_failed=: +$at_diff "$at_devnull" "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/pipe.at:33: 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/pipe.at:33: mkdir gnu @@ -1872,7 +2030,7 @@ cmp orig/file2 directory/file2) ) >"$at_stdout" 2>"$at_stderr" fi at_failed=false -$at_diff "$at_devnull" "$at_stderr" || at_failed=: +echo stderr:; tee stderr <"$at_stderr" echo >>"$at_stdout"; echo "directory/ directory/file1 directory/file2 @@ -1895,6 +2053,47 @@ fi $at_traceon + $at_traceoff +echo "$at_srcdir/pipe.at:33: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo pipe.at:33 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + +at_failed=false +$at_diff "$at_devnull" "$at_stderr" || at_failed=: +$at_diff "$at_devnull" "$at_stdout" || at_failed=: +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/pipe.at:33: 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" @@ -2157,6 +2356,7 @@ fi $at_traceon + # Testing one format is enough $at_traceoff @@ -2296,6 +2496,7 @@ fi $at_traceon + # Testing one format is enough $at_traceoff @@ -2413,7 +2614,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/indexfile.at:29: mkdir oldgnu (cd oldgnu @@ -2507,7 +2709,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/indexfile.at:29: mkdir ustar (cd ustar @@ -2601,7 +2804,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/indexfile.at:29: mkdir posix (cd posix @@ -2695,7 +2899,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/indexfile.at:29: mkdir gnu (cd gnu @@ -2792,6 +2997,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -2895,7 +3101,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/verbose.at:29: mkdir oldgnu (cd oldgnu @@ -2977,7 +3184,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/verbose.at:29: mkdir ustar (cd ustar @@ -3059,7 +3267,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/verbose.at:29: mkdir posix (cd posix @@ -3141,7 +3350,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/verbose.at:29: mkdir gnu (cd gnu @@ -3226,6 +3436,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -3321,7 +3532,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append.at:24: mkdir oldgnu (cd oldgnu @@ -3395,7 +3607,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append.at:24: mkdir ustar (cd ustar @@ -3469,7 +3682,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append.at:24: mkdir posix (cd posix @@ -3543,7 +3757,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append.at:24: mkdir gnu (cd gnu @@ -3620,6 +3835,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -3723,7 +3939,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append01.at:34: mkdir ustar (cd ustar @@ -3803,7 +4020,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append01.at:34: mkdir posix (cd posix @@ -3883,7 +4101,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append01.at:34: mkdir gnu (cd gnu @@ -3966,6 +4185,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -4119,7 +4339,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append02.at:43: mkdir oldgnu (cd oldgnu @@ -4251,7 +4472,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append02.at:43: mkdir ustar (cd ustar @@ -4383,7 +4605,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append02.at:43: mkdir posix (cd posix @@ -4515,7 +4738,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/append02.at:43: mkdir gnu (cd gnu @@ -4650,6 +4874,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -4932,6 +5157,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -5029,7 +5255,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete01.at:26: mkdir oldgnu (cd oldgnu @@ -5105,7 +5332,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete01.at:26: mkdir ustar (cd ustar @@ -5181,7 +5409,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete01.at:26: mkdir posix (cd posix @@ -5257,7 +5486,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete01.at:26: mkdir gnu (cd gnu @@ -5336,6 +5566,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -5447,7 +5678,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete02.at:26: mkdir oldgnu (cd oldgnu @@ -5537,7 +5769,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete02.at:26: mkdir ustar (cd ustar @@ -5627,7 +5860,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete02.at:26: mkdir posix (cd posix @@ -5717,7 +5951,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete02.at:26: mkdir gnu (cd gnu @@ -5810,6 +6045,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -5931,7 +6167,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete03.at:26: mkdir oldgnu (cd oldgnu @@ -6029,7 +6266,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete03.at:26: mkdir posix (cd posix @@ -6130,6 +6368,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -6262,7 +6501,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete04.at:26: mkdir oldgnu (cd oldgnu @@ -6373,7 +6613,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete04.at:26: mkdir ustar (cd ustar @@ -6484,7 +6725,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete04.at:26: mkdir posix (cd posix @@ -6595,7 +6837,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete04.at:26: mkdir gnu (cd gnu @@ -6709,6 +6952,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -6821,7 +7065,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete05.at:30: mkdir oldgnu (cd oldgnu @@ -6912,7 +7157,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete05.at:30: mkdir ustar (cd ustar @@ -7003,7 +7249,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete05.at:30: mkdir posix (cd posix @@ -7094,7 +7341,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/delete05.at:30: mkdir gnu (cd gnu @@ -7188,6 +7436,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -7284,7 +7533,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac01.at:26: mkdir oldgnu (cd oldgnu @@ -7359,7 +7609,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac01.at:26: mkdir ustar (cd ustar @@ -7434,7 +7685,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac01.at:26: mkdir posix (cd posix @@ -7509,7 +7761,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac01.at:26: mkdir gnu (cd gnu @@ -7587,6 +7840,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -7691,7 +7945,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac02.at:28: mkdir oldgnu (cd oldgnu @@ -7772,7 +8027,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac02.at:28: mkdir ustar (cd ustar @@ -7853,7 +8109,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac02.at:28: mkdir posix (cd posix @@ -7934,7 +8191,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac02.at:28: mkdir gnu (cd gnu @@ -8018,6 +8276,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -8114,7 +8373,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac03.at:26: mkdir oldgnu (cd oldgnu @@ -8189,7 +8449,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac03.at:26: mkdir ustar (cd ustar @@ -8264,7 +8525,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac03.at:26: mkdir posix (cd posix @@ -8339,7 +8601,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac03.at:26: mkdir gnu (cd gnu @@ -8417,6 +8680,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -8549,7 +8813,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac04.at:26: mkdir oldgnu (cd oldgnu @@ -8660,7 +8925,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac04.at:26: mkdir ustar (cd ustar @@ -8771,7 +9037,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac04.at:26: mkdir posix (cd posix @@ -8882,7 +9149,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac04.at:26: mkdir gnu (cd gnu @@ -8996,6 +9264,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -9133,6 +9402,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -9302,7 +9572,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac06.at:36: mkdir oldgnu (cd oldgnu @@ -9450,7 +9721,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac06.at:36: mkdir ustar (cd ustar @@ -9598,7 +9870,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac06.at:36: mkdir posix (cd posix @@ -9746,7 +10019,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac06.at:36: mkdir gnu (cd gnu @@ -9897,6 +10171,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -10036,7 +10311,8 @@ else fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac07.at:30: mkdir oldgnu (cd oldgnu @@ -10154,7 +10430,8 @@ else fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac07.at:30: mkdir ustar (cd ustar @@ -10272,7 +10549,8 @@ else fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac07.at:30: mkdir posix (cd posix @@ -10390,7 +10668,8 @@ else fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/extrac07.at:30: mkdir gnu (cd gnu @@ -10509,6 +10788,7 @@ fi $at_traceon + # Testing one format is enough $at_traceoff @@ -10757,7 +11037,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incremental.at:26: mkdir oldgnu (cd oldgnu @@ -10902,7 +11183,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incremental.at:26: mkdir posix (cd posix @@ -11050,6 +11332,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -11175,7 +11458,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr01.at:30: mkdir oldgnu (cd oldgnu @@ -11279,7 +11563,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr01.at:30: mkdir posix (cd posix @@ -11386,6 +11671,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -11575,7 +11861,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr02.at:35: mkdir oldgnu (cd oldgnu @@ -11743,7 +12030,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr02.at:35: mkdir posix (cd posix @@ -11914,6 +12202,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -12073,7 +12362,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/listed01.at:29: mkdir oldgnu (cd oldgnu @@ -12214,6 +12504,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -12522,7 +12813,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/listed02.at:31: mkdir oldgnu (cd oldgnu @@ -12812,6 +13104,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -12995,7 +13288,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr03.at:31: mkdir oldgnu (cd oldgnu @@ -13157,7 +13451,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr03.at:31: mkdir posix (cd posix @@ -13322,6 +13617,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -13600,7 +13896,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr04.at:34: mkdir oldgnu (cd oldgnu @@ -13855,7 +14152,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/incr04.at:34: mkdir posix (cd posix @@ -14113,6 +14411,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -14312,7 +14611,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename01.at:27: mkdir oldgnu (cd oldgnu @@ -14490,7 +14790,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename01.at:27: mkdir posix (cd posix @@ -14671,6 +14972,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -14893,7 +15195,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename02.at:27: mkdir oldgnu (cd oldgnu @@ -15094,7 +15397,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename02.at:27: mkdir posix (cd posix @@ -15298,6 +15602,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -15569,7 +15874,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename03.at:26: mkdir oldgnu (cd oldgnu @@ -15819,7 +16125,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename03.at:26: mkdir posix (cd posix @@ -16072,6 +16379,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -16257,7 +16565,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename04.at:30: mkdir oldgnu (cd oldgnu @@ -16421,7 +16730,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename04.at:30: mkdir posix (cd posix @@ -16588,6 +16898,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -16776,7 +17087,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename05.at:27: mkdir oldgnu (cd oldgnu @@ -16943,7 +17255,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/rename05.at:27: mkdir posix (cd posix @@ -17113,6 +17426,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -17296,7 +17610,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/chtype.at:30: mkdir oldgnu (cd oldgnu @@ -17458,7 +17773,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/chtype.at:30: mkdir posix (cd posix @@ -17623,6 +17939,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -17840,7 +18157,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/ignfail.at:26: mkdir oldgnu (cd oldgnu @@ -18036,7 +18354,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/ignfail.at:26: mkdir ustar (cd ustar @@ -18232,7 +18551,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/ignfail.at:26: mkdir posix (cd posix @@ -18428,7 +18748,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/ignfail.at:26: mkdir gnu (cd gnu @@ -18627,6 +18948,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -18751,7 +19073,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/link01.at:36: mkdir oldgnu (cd oldgnu @@ -18854,7 +19177,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/link01.at:36: mkdir ustar (cd ustar @@ -18957,7 +19281,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/link01.at:36: mkdir posix (cd posix @@ -19060,7 +19385,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/link01.at:36: mkdir gnu (cd gnu @@ -19166,6 +19492,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -19278,6 +19605,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -19383,7 +19711,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/long01.at:36: mkdir oldgnu (cd oldgnu @@ -19466,6 +19795,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -19563,6 +19893,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -19667,6 +19998,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -19777,6 +20109,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -19952,7 +20285,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/multiv01.at:30: mkdir oldgnu (cd oldgnu @@ -20102,7 +20436,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/multiv01.at:30: mkdir pax (cd pax @@ -20255,6 +20590,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -20371,7 +20707,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/multiv02.at:31: mkdir oldgnu (cd oldgnu @@ -20466,7 +20803,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/multiv02.at:31: mkdir pax (cd pax @@ -20564,6 +20902,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -20738,7 +21077,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/multiv03.at:33: mkdir oldgnu (cd oldgnu @@ -20894,6 +21234,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -21030,7 +21371,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/multiv04.at:39: mkdir oldgnu (cd oldgnu @@ -21148,6 +21490,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -21335,6 +21678,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -21444,7 +21788,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/multiv06.at:30: mkdir pax (cd pax @@ -21535,6 +21880,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -21703,7 +22049,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/recurse.at:24: mkdir oldgnu (cd oldgnu @@ -21779,7 +22126,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/recurse.at:24: mkdir ustar (cd ustar @@ -21855,7 +22203,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/recurse.at:24: mkdir posix (cd posix @@ -21931,7 +22280,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/recurse.at:24: mkdir gnu (cd gnu @@ -22010,6 +22360,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -22132,7 +22483,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order01.at:29: mkdir oldgnu (cd oldgnu @@ -22233,7 +22585,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order01.at:29: mkdir ustar (cd ustar @@ -22334,7 +22687,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order01.at:29: mkdir posix (cd posix @@ -22435,7 +22789,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order01.at:29: mkdir gnu (cd gnu @@ -22539,6 +22894,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -22665,7 +23021,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order02.at:28: mkdir oldgnu (cd oldgnu @@ -22770,7 +23127,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order02.at:28: mkdir ustar (cd ustar @@ -22875,7 +23233,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order02.at:28: mkdir posix (cd posix @@ -22980,7 +23339,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/same-order02.at:28: mkdir gnu (cd gnu @@ -23088,6 +23448,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -23109,6 +23470,8 @@ $at_traceon + + $at_traceoff echo "$at_srcdir/shortrec.at:28: mkdir v7 @@ -23121,10 +23484,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory )" @@ -23147,10 +23510,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stder1" @@ -23169,16 +23532,54 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; cat "$at_stdout" +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/shortrec.at:28: 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/shortrec.at:28: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo shortrec.at:28 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + at_failed=false $at_diff "$at_devnull" "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: @@ -23196,6 +23597,7 @@ if $at_failed; then fi $at_traceon + $at_traceoff echo "$at_srcdir/shortrec.at:28: mkdir oldgnu @@ -23208,10 +23610,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory )" @@ -23234,10 +23636,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stder1" @@ -23256,16 +23658,54 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; cat "$at_stdout" +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/shortrec.at:28: 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/shortrec.at:28: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo shortrec.at:28 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + at_failed=false $at_diff "$at_devnull" "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: @@ -23283,6 +23723,7 @@ if $at_failed; then fi $at_traceon + $at_traceoff echo "$at_srcdir/shortrec.at:28: mkdir ustar @@ -23295,10 +23736,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory )" @@ -23321,10 +23762,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stder1" @@ -23343,16 +23784,54 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; cat "$at_stdout" +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/shortrec.at:28: 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/shortrec.at:28: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo shortrec.at:28 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + at_failed=false $at_diff "$at_devnull" "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: @@ -23370,6 +23849,7 @@ if $at_failed; then fi $at_traceon + $at_traceoff echo "$at_srcdir/shortrec.at:28: mkdir posix @@ -23382,10 +23862,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory )" @@ -23408,10 +23888,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stder1" @@ -23430,16 +23910,54 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; cat "$at_stdout" +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/shortrec.at:28: 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/shortrec.at:28: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo shortrec.at:28 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + at_failed=false $at_diff "$at_devnull" "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: @@ -23457,6 +23975,7 @@ if $at_failed; then fi $at_traceon + $at_traceoff echo "$at_srcdir/shortrec.at:28: mkdir gnu @@ -23469,10 +23988,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory )" @@ -23495,10 +24014,10 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stder1" @@ -23517,16 +24036,54 @@ rm -rf * mkdir directory (cd directory && touch a b c d e f g h i j k l m n o p q r) -tar -c -b 1 -f - directory | tar -t -f - >/dev/null +tar -c -b 1 -f - directory | tar -t -f - tar -c -b 1 -f archive directory -tar -t -f archive >/dev/null -tar -t -f - < archive >/dev/null +tar -t -f archive +tar -t -f - < archive rm -r directory ) ) >"$at_stdout" 2>"$at_stderr" at_status=$? fi +at_failed=false +echo stderr:; tee stderr <"$at_stderr" +echo stdout:; cat "$at_stdout" +case $at_status in + 77) echo 77 > "$at_status_file"; exit 77;; + 0) ;; + *) echo "$at_srcdir/shortrec.at:28: 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/shortrec.at:28: grep -v '^.*tar: Record size = ' stderr; exit 0" +echo shortrec.at:28 >"$at_check_line_file" + +at_trace_this= +if test -n "$at_traceon"; then + at_trace_this=yes +fi + +if test -n "$at_trace_this"; then + ( $at_traceon; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stder1" + at_status=$? + grep '^ *+' "$at_stder1" >&2 + grep -v '^ *+' "$at_stder1" >"$at_stderr" +else + ( :; grep -v '^.*tar: Record size = ' stderr; exit 0 ) >"$at_stdout" 2>"$at_stderr" + at_status=$? +fi + at_failed=false $at_diff "$at_devnull" "$at_stderr" || at_failed=: $at_diff "$at_devnull" "$at_stdout" || at_failed=: @@ -23547,6 +24104,10 @@ $at_traceon + + + + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -23667,7 +24228,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/sparse01.at:24: mkdir gnu (cd gnu @@ -23766,7 +24328,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/sparse01.at:24: mkdir oldgnu (cd oldgnu @@ -23869,6 +24432,7 @@ $at_traceon + cat >stdout.re <<'_ATEOF' separator -rw-r--r-- ^ ^ * *1000 0-90-90-90-9-0-90-9-0-90-9 0-90-9:0-90-9 begin @@ -23993,7 +24557,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/sparse02.at:28: mkdir gnu (cd gnu @@ -24075,7 +24640,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/sparse02.at:28: mkdir oldgnu (cd oldgnu @@ -24160,6 +24726,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -24289,6 +24856,7 @@ $at_traceon + cat >stdout.re <<'_ATEOF' separator -rw-r--r-- ^ ^ * *1000 0-90-90-90-9-0-90-9-0-90-9 0-90-9:0-90-9 begin @@ -24461,7 +25029,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/sparsemv.at:31: mkdir oldgnu (cd oldgnu @@ -24591,6 +25160,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -24745,6 +25315,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -24899,6 +25470,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -25053,6 +25625,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -25178,7 +25751,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/update.at:30: mkdir oldgnu (cd oldgnu @@ -25282,7 +25856,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/update.at:30: mkdir ustar (cd ustar @@ -25386,7 +25961,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/update.at:30: mkdir posix (cd posix @@ -25490,7 +26066,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/update.at:30: mkdir gnu (cd gnu @@ -25597,6 +26174,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -25735,7 +26313,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/volume.at:26: mkdir oldgnu (cd oldgnu @@ -25855,6 +26434,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -25992,7 +26572,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/volsize.at:32: mkdir oldgnu (cd oldgnu @@ -26108,7 +26689,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/volsize.at:32: mkdir ustar (cd ustar @@ -26224,7 +26806,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/volsize.at:32: mkdir posix (cd posix @@ -26340,7 +26923,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/volsize.at:32: mkdir gnu (cd gnu @@ -26459,6 +27043,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -26577,7 +27162,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/comprec.at:25: mkdir oldgnu (cd oldgnu @@ -26673,7 +27259,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/comprec.at:25: mkdir ustar (cd ustar @@ -26769,7 +27356,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/comprec.at:25: mkdir posix (cd posix @@ -26865,7 +27453,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/comprec.at:25: mkdir gnu (cd gnu @@ -26964,6 +27553,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -27059,6 +27649,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -27149,7 +27740,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/shortupd.at:32: mkdir oldgnu (cd oldgnu @@ -27218,7 +27810,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/shortupd.at:32: mkdir ustar (cd ustar @@ -27287,7 +27880,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/shortupd.at:32: mkdir posix (cd posix @@ -27356,7 +27950,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/shortupd.at:32: mkdir gnu (cd gnu @@ -27428,6 +28023,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -27541,7 +28137,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/truncate.at:32: mkdir oldgnu (cd oldgnu @@ -27633,7 +28230,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/truncate.at:32: mkdir ustar (cd ustar @@ -27725,7 +28323,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/truncate.at:32: mkdir posix (cd posix @@ -27817,7 +28416,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/truncate.at:32: mkdir gnu (cd gnu @@ -27912,6 +28512,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -28011,7 +28612,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/grow.at:27: mkdir oldgnu (cd oldgnu @@ -28089,7 +28691,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/grow.at:27: mkdir ustar (cd ustar @@ -28167,7 +28770,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/grow.at:27: mkdir posix (cd posix @@ -28245,7 +28849,8 @@ if $at_failed; then fi $at_traceon -$at_traceoff + + $at_traceoff echo "$at_srcdir/grow.at:27: mkdir gnu (cd gnu @@ -28326,6 +28931,7 @@ $at_traceon + $at_traceoff $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 | eval $at_tee_pipe @@ -29248,7 +29854,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.21] $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.22] $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 2fa5392..a12477d 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright (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 @@ -21,6 +21,7 @@ # We need a recent Autotest. m4_version_prereq([2.52g]) +m4_define([AT_TAR_CHECK_HOOK]) m4_define([AT_TAR_CHECK],[ AT_XFAIL_IF(test -f $[]XFAILFILE) m4_foreach([FMT], @@ -33,9 +34,20 @@ export TEST_TAR_FORMAT TAR_OPTIONS="-H FMT" export TAR_OPTIONS rm -rf * -$1)],$2,$3,$4,$5,$6)]) +$1)],$2,$3,$4,$5,$6) + AT_TAR_CHECK_HOOK]) ]) +m4_define([AT_TAR_WITH_HOOK],[ + m4_pushdef([AT_TAR_CHECK_HOOK],[$1]) + $2 + + m4_popdef([AT_TAR_CHECK_HOOK])]) + +m4_define([TAR_IGNREC_HOOK],[ + AT_CHECK([grep -v '^.*tar: Record size = ' stderr; exit 0]) +]) + m4_define([RE_CHECK],[ AT_DATA([$1.re],[$2]) awk '{print NR " " $[]0}' $1 > $[]$.1